commit cac2784ecc4fd178c604e2c2ed5bc5ea193ef605
author Bernie Innocenti <codewiz@google.com> Fri Dec 13 11:49:33 2019 +0900
committer Bernie Innocenti <codewiz@google.com> Sat Dec 14 08:48:07 2019 +0900
tree bb568382b37ab6c26932e4ddc210d786b87641c2
parent cebc76db4c729b9dfe450f2e41c4fad042ff6b35

Add DnsResolver tests to mts test suite

Change-Id: I25fe98ac6a6b27dbe9955518405a58f1acccf73f

Android.bp

diff --git a/Android.bp b/Android.bp
index a228e9b..0faf45f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -164,7 +164,7 @@
 // TODO: Move this test to tests/
 cc_test {
     name: "resolv_unit_test",
-    test_suites: ["device-tests"],
+    test_suites: ["device-tests", "mts"],
     require_root: true,
     //TODO:  drop root privileges and make it be an real unit test.
     defaults: ["netd_defaults"],
@@ -200,4 +200,13 @@
         "server_configurable_flags",
         "stats_proto",
     ],
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
 }

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 0d6ddff..41282f5 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -32,7 +32,7 @@
 
 cc_test {
     name: "resolv_gold_test",
-    test_suites: ["device-tests"],
+    test_suites: ["device-tests", "mts"],
     require_root: true,
     defaults: ["netd_defaults"],
     data: ["testdata/*.pbtxt"],
@@ -64,11 +64,12 @@
         "server_configurable_flags",
         "stats_proto",
     ],
+    compile_multilib: "first",
 }
 
 cc_test {
     name: "resolv_stress_test",
-    test_suites: ["device-tests"],
+    test_suites: ["device-tests", "mts"],
     // This won't work with test_config
     // require_root: true,
     test_config: "resolv_stress_test_config.xml",
@@ -95,12 +96,12 @@
         "netd_event_listener_interface-ndk_platform",
         "netd_aidl_interface-ndk_platform",
     ],
-    compile_multilib: "both",
+    compile_multilib: "first",
 }
 
 cc_test {
     name: "resolv_integration_test",
-    test_suites: ["device-tests"],
+    test_suites: ["device-tests", "mts"],
     require_root: true,
     defaults: ["netd_defaults"],
     tidy: false, // cuts test build time by > 1m30s
@@ -138,4 +139,12 @@
         "netd_event_listener_interface-ndk_platform",
     ],
     compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
 }