commit 17b2be05a21294a9a31c623a4714f18f4e5babcf
author Tom Cherry <tomcherry@google.com> Tue Aug 20 10:43:48 2019 -0700
committer Tom Cherry <tomcherry@google.com> Thu Aug 22 08:37:55 2019 -0700
tree 153b73b3861aad0dfd4bc0a4fd6b841b72c5250a
parent 61bffa5fc0f433163efb2efdedf26e4e1eed751f

Add init_tests to CTS

Test: atest CtsInitTestCases
Test: Cts in presubmit still passes
Change-Id: Ic16dafbaacfbace904947bd3ce2b8586f981348f

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 3233cc3..6dd2b9f 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -206,9 +206,18 @@
 // ------------------------------------------------------------------------------
 
 cc_test {
-    name: "init_tests",
+    name: "CtsInitTestCases",
     defaults: ["init_defaults"],
-    compile_multilib: "first",
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+
     srcs: [
         "devices_test.cpp",
         "init_test.cpp",
@@ -225,7 +234,12 @@
         "util_test.cpp",
     ],
     static_libs: ["libinit"],
-    test_suites: ["device-tests"],
+
+    test_suites: [
+        "cts",
+        "device-tests",
+        "vts",
+    ],
 }
 
 cc_benchmark {