Snap for 9368510 from 05e757b414f9eb56a25d3c573554356c6b52bd75 to mainline-sdkext-release
Change-Id: If7b4d647ed412f1a0c1d7bdd3d182e6311bad141
diff --git a/Android.bp b/Android.bp
index e851f82..11d0597 100644
--- a/Android.bp
+++ b/Android.bp
@@ -150,6 +150,22 @@
},
}
+cc_defaults {
+ // Similar to resolv_test_mts_coverage_defaults, but it's for the tests that don't need
+ // root access.
+ name: "resolv_test_mts_coverage_without_root_defaults",
+ test_config_template: ":resolv_test_config_without_root_template",
+ compile_multilib: "both",
+ multilib: {
+ lib32: {
+ suffix: "32",
+ },
+ lib64: {
+ suffix: "64",
+ },
+ },
+}
+
cc_library {
name: "libnetd_resolv",
version_script: "libnetd_resolv.map.txt",
@@ -308,6 +324,13 @@
}
filegroup {
+ name: "resolv_test_config_without_root_template",
+ srcs: [
+ "resolv_test_config_without_root_template.xml",
+ ],
+}
+
+filegroup {
name: "resolv_unit_test_files",
srcs: [
"DnsQueryLogTest.cpp",
diff --git a/resolv_test_config_template.xml b/resolv_test_config_template.xml
index e649970..f4a4413 100644
--- a/resolv_test_config_template.xml
+++ b/resolv_test_config_template.xml
@@ -21,6 +21,13 @@
<configuration description="Configuration for {MODULE} tests">
<option name="test-suite-tag" value="mts" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+
+ <!-- To avoid module rollbacks due to "adbd exits 4 times in 4 minutes" caused by repeated
+ root/unroot, reboot the device to reset the crash counter in init service.
+ See b/260180513 for more details.
+ -->
+ <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />
+
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.testutils.DisableConfigSyncTargetPreparer" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
diff --git a/resolv_test_config_without_root_template.xml b/resolv_test_config_without_root_template.xml
new file mode 100644
index 0000000..ffc88ca
--- /dev/null
+++ b/resolv_test_config_without_root_template.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Workaround for MTS coverage because test infra is running the 64 bit
+ test suite on cf_x86_phone (32-bit). See b/147785146 for details.
+ We need to push the correct binary against the architecture of
+ test device with "append-bitness" option.
+-->
+<configuration description="Configuration for {MODULE} tests">
+ <option name="test-suite-tag" value="mts" />
+ <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+ <target_preparer class="com.android.testutils.DisableConfigSyncTargetPreparer" />
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+ <option name="cleanup" value="true" />
+ <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
+ <option name="append-bitness" value="true" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.GTest" >
+ <option name="native-test-device-path" value="/data/local/tmp" />
+ <option name="module-name" value="{MODULE}" />
+ <option name="runtime-hint" value="10m" />
+ <!-- test-timeout unit is ms, value = 10 min -->
+ <option name="native-test-timeout" value="600000" />
+ </test>
+</configuration>
diff --git a/tests/Android.bp b/tests/Android.bp
index 9df15d3..f3ec842 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -314,7 +314,7 @@
"connectivity-mainline-presubmit-cc-defaults",
"netd_defaults",
"resolv_test_defaults",
- "resolv_test_mts_coverage_defaults",
+ "resolv_test_mts_coverage_without_root_defaults",
],
header_libs: [
"libnetd_resolv_internal_headers",
@@ -340,6 +340,7 @@
],
srcs: [
"doh_frontend.cpp",
+ "fuzzer/resolv_fuzzer_utils.cpp",
],
header_libs: [
"libnetd_resolv_headers",
diff --git a/tests/fuzzer/resolv_fuzzer_utils.cpp b/tests/fuzzer/resolv_fuzzer_utils.cpp
new file mode 100644
index 0000000..6fda744
--- /dev/null
+++ b/tests/fuzzer/resolv_fuzzer_utils.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "resolv_fuzzer_utils.h"
+
+namespace android::net {
+
+// Initializes servers to simulate the DNS over UDP/TLS/HTTPS.
+test::DNSResponder dns{kDefaultServer, kDnsPortString};
+test::DohFrontend doh{kDefaultServer, kDohPortString, "127.0.1.3", kDnsPortString};
+test::DNSResponder doh_backend{"127.0.1.3", kDnsPortString};
+test::DnsTlsFrontend dot{kDefaultServer, kDotPortString, "127.0.2.3", kDnsPortString};
+test::DNSResponder dot_backend{"127.0.2.3", kDnsPortString};
+ResolverController resolverCtrl;
+
+// TODO: Consider moving to packages/modules/DnsResolver/tests/resolv_test_utils.h.
+void StartDns(test::DNSResponder& dns, const std::vector<DnsRecord>& records) {
+ for (const auto& r : records) {
+ dns.addMapping(r.host_name, r.type, r.addr);
+ }
+
+ ASSERT_TRUE(dns.startServer());
+ dns.clearQueries();
+}
+
+int RandomSocketType(FuzzedDataProvider& fdp) {
+ int socktype = fdp.PickValueInArray(
+ {SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, SOCK_RDM, SOCK_SEQPACKET, SOCK_DCCP, SOCK_PACKET});
+ if (fdp.ConsumeBool()) socktype |= SOCK_CLOEXEC;
+ if (fdp.ConsumeBool()) socktype |= SOCK_NONBLOCK;
+ return socktype;
+}
+
+// Initializes the callback functions to createNetworkCache.
+void InitDnsResolverCallbacks() {
+ gResNetdCallbacks.check_calling_permission = [](const char*) -> bool { return true; };
+ gResNetdCallbacks.get_network_context = [](uint32_t, uint32_t, android_net_context*) {};
+ gResNetdCallbacks.log = [](const char*) {};
+}
+
+void InitServers() {
+ StartDns(dns, records);
+ doh.startServer();
+ StartDns(doh_backend, records);
+ dot.startServer();
+ StartDns(dot_backend, records);
+}
+
+void CleanServers() {
+ dns.clearQueries();
+ doh.clearQueries();
+ doh_backend.clearQueries();
+ dot.clearQueries();
+ dot_backend.clearQueries();
+}
+
+// Initializes servers only one time.
+bool DoInit() {
+ // Sets log level to WARNING to lower I/O time cost.
+ resolv_set_log_severity(android::base::WARNING);
+ doh_init_logger(DOH_LOG_LEVEL_WARN);
+
+ // Needs to init callback and create netework cache.
+ InitDnsResolverCallbacks();
+ resolverCtrl.createNetworkCache(TEST_NETID);
+ InitServers();
+
+ return true;
+}
+
+void CleanUp() {
+ CleanServers();
+ resolverCtrl.flushNetworkCache(TEST_NETID);
+}
+
+} // namespace android::net
\ No newline at end of file
diff --git a/tests/fuzzer/resolv_fuzzer_utils.h b/tests/fuzzer/resolv_fuzzer_utils.h
index f8da743..2a15a30 100644
--- a/tests/fuzzer/resolv_fuzzer_utils.h
+++ b/tests/fuzzer/resolv_fuzzer_utils.h
@@ -39,73 +39,16 @@
.uid = TEST_UID,
};
-// Initializes servers to simulate the DNS over UDP/TLS/HTTPS.
-test::DNSResponder dns{kDefaultServer, kDnsPortString};
-test::DohFrontend doh{kDefaultServer, kDohPortString, "127.0.1.3", kDnsPortString};
-test::DNSResponder doh_backend{"127.0.1.3", kDnsPortString};
-test::DnsTlsFrontend dot{kDefaultServer, kDotPortString, "127.0.2.3", kDnsPortString};
-test::DNSResponder dot_backend{"127.0.2.3", kDnsPortString};
-ResolverController resolverCtrl;
+extern test::DnsTlsFrontend dot;
+extern ResolverController resolverCtrl;
-// TODO: Consider moving to packages/modules/DnsResolver/tests/resolv_test_utils.h.
-void StartDns(test::DNSResponder& dns, const std::vector<DnsRecord>& records) {
- for (const auto& r : records) {
- dns.addMapping(r.host_name, r.type, r.addr);
- }
-
- ASSERT_TRUE(dns.startServer());
- dns.clearQueries();
-}
-
-int RandomSocketType(FuzzedDataProvider& fdp) {
- int socktype = fdp.PickValueInArray(
- {SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, SOCK_RDM, SOCK_SEQPACKET, SOCK_DCCP, SOCK_PACKET});
- if (fdp.ConsumeBool()) socktype |= SOCK_CLOEXEC;
- if (fdp.ConsumeBool()) socktype |= SOCK_NONBLOCK;
- return socktype;
-}
-
-// Initializes the callback functions to createNetworkCache.
-void InitDnsResolverCallbacks() {
- gResNetdCallbacks.check_calling_permission = [](const char*) -> bool { return true; };
- gResNetdCallbacks.get_network_context = [](uint32_t, uint32_t, android_net_context*) {};
- gResNetdCallbacks.log = [](const char*) {};
-}
-
-void InitServers() {
- StartDns(dns, records);
- doh.startServer();
- StartDns(doh_backend, records);
- dot.startServer();
- StartDns(dot_backend, records);
-}
-
-void CleanServers() {
- dns.clearQueries();
- doh.clearQueries();
- doh_backend.clearQueries();
- dot.clearQueries();
- dot_backend.clearQueries();
-}
-
-// Initializes servers only one time.
-bool DoInit() {
- // Sets log level to WARNING to lower I/O time cost.
- resolv_set_log_severity(android::base::WARNING);
- doh_init_logger(DOH_LOG_LEVEL_WARN);
-
- // Needs to init callback and create netework cache.
- InitDnsResolverCallbacks();
- resolverCtrl.createNetworkCache(TEST_NETID);
- InitServers();
-
- return true;
-}
-
-void CleanUp() {
- CleanServers();
- resolverCtrl.flushNetworkCache(TEST_NETID);
-}
+void StartDns(test::DNSResponder& dns, const std::vector<DnsRecord>& records);
+int RandomSocketType(FuzzedDataProvider& fdp);
+void InitDnsResolverCallbacks();
+void InitServers();
+void CleanServers();
+bool DoInit();
+void CleanUp();
} // namespace android::net
diff --git a/tests/resolv_gold_test_config.xml b/tests/resolv_gold_test_config.xml
index 3c34d6c..653c9c8 100644
--- a/tests/resolv_gold_test_config.xml
+++ b/tests/resolv_gold_test_config.xml
@@ -16,6 +16,13 @@
<configuration description="Configuration for resolv gold tests">
<option name="test-suite-tag" value="mts" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
+
+ <!-- To avoid module rollbacks due to "adbd exits 4 times in 4 minutes" caused by repeated
+ root/unroot, reboot the device to reset the crash counter in init service.
+ See b/260180513 for more details.
+ -->
+ <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />
+
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index 3dbe359..0fe7fc5 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -7730,6 +7730,10 @@
// Test if the "do not send AAAA query when IPv6 address is link-local with a default route" feature
// can be toggled by flag.
TEST_F(ResolverMultinetworkTest, IPv6LinkLocalWithDefaultRouteFlag) {
+ // Kernel 4.4 does not provide an IPv6 link-local address when an interface is added to a
+ // network. Skip it because v6 link-local address is a prerequisite for this test.
+ SKIP_IF_KERNEL_VERSION_LOWER_THAN(4, 9, 0);
+
constexpr char host_name[] = "ohayou.example.com.";
const struct TestConfig {
std::string flagValue;
