diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-27 18:03:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-27 18:03:04 +0000 |
| commit | e59dcab142519a06dc724b2298dd5dfe7202c7c1 (patch) | |
| tree | d1797985178d37377d4d8b3941bf83ceb9ac1c97 | |
| parent | 862510826b226ca0c0e9e2f2dd7d3ae8d9aca2cc (diff) | |
| parent | 7ed376331c87a4b08b62ac8cf8e3184dc00d58fb (diff) | |
| download | cts-lollipop-mr1-cts-dev.tar.gz | |
Merge "Fix expected reverse lookup of Google DNS IP addresses" into lollipop-mr1-cts-devlollipop-mr1-cts-dev
| -rw-r--r-- | tests/tests/net/jni/NativeDnsJni.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/tests/net/jni/NativeDnsJni.c b/tests/tests/net/jni/NativeDnsJni.c index b975594b260..88ac820601a 100644 --- a/tests/tests/net/jni/NativeDnsJni.c +++ b/tests/tests/net/jni/NativeDnsJni.c @@ -119,8 +119,8 @@ JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclas gai_strerror(res)); return JNI_FALSE; } - if (strstr(buf, "google.com") == NULL) { - ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com: %s", + if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) { + ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s", GoogleDNSIpV4Address, buf); return JNI_FALSE; } @@ -132,8 +132,9 @@ JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclas res, gai_strerror(res)); return JNI_FALSE; } - if (strstr(buf, "google.com") == NULL) { - ALOGD("getnameinfo(%s) didn't return google.com: %s", GoogleDNSIpV6Address2, buf); + if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) { + ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s", + GoogleDNSIpV6Address2, buf); return JNI_FALSE; } |