Add VTS kernel tests to general-tests suite am: 59719c87ea

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/2062907

Change-Id: Ie3749fb75dafe1bfbf3e316fbe7e01a86ec9c090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 48 insertions, 12 deletions

diff --git a/linux_kselftest/testcases/Android.bp b/linux_kselftest/testcases/Android.bp
index 331c7c61..048a7870 100644
--- a/linux_kselftest/testcases/Android.bp
+++ b/linux_kselftest/testcases/Android.bp
@@ -21,27 +21,39 @@ package {
 sh_test {
     name: "vts_linux_kselftest_arm_64",
     src: "phony_kselftest_arm64.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: "vts_linux_kselftest_arm_64.xml",
 }
 
 sh_test {
     name: "vts_linux_kselftest_arm_32",
     src: "phony_kselftest_arm.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: "vts_linux_kselftest_arm_32.xml",
 }
 
 sh_test {
     name: "vts_linux_kselftest_x86_64",
     src: "phony_kselftest_x86_64.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: "vts_linux_kselftest_x86_64.xml",
 }
 
 sh_test {
     name: "vts_linux_kselftest_x86_32",
     src: "phony_kselftest_x86.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: "vts_linux_kselftest_x86_32.xml",
 }
diff --git a/ltp/testcase/Android.bp b/ltp/testcase/Android.bp
index 2548ab2a..87742ca1 100644
--- a/ltp/testcase/Android.bp
+++ b/ltp/testcase/Android.bp
@@ -21,7 +21,10 @@ package {
 sh_test {
     name: "vts_ltp_test_arm_64",
     src: "phony_ltp_test_arm64.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_arm_64",
 }
 
@@ -39,7 +42,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_arm_64_lowmem",
     src: "phony_ltp_test_arm64_lowmem.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_arm_64_lowmem",
 }
 
@@ -57,7 +63,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_arm_64_hwasan",
     src: "phony_ltp_test_arm64_hwasan.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_arm_64_hwasan",
 }
 
@@ -75,7 +84,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_arm_64_lowmem_hwasan",
     src: "phony_ltp_test_arm64_lowmem_hwasan.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_arm_64_lowmem_hwasan",
 }
 
@@ -93,7 +105,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_arm",
     src: "phony_ltp_test_arm.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_arm",
 }
 
@@ -111,7 +126,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_arm_lowmem",
     src: "phony_ltp_test_arm_lowmem.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_arm_lowmem",
 }
 
@@ -129,7 +147,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_x86_64",
     src: "phony_ltp_test_x86_64.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_x86_64",
 }
 
@@ -147,7 +168,10 @@ genrule {
 sh_test {
     name: "vts_ltp_test_x86",
     src: "phony_ltp_test_x86.sh",
-    test_suites: ["vts"],
+    test_suites: [
+        "general-tests",
+        "vts"
+    ],
     test_config: ":ltp_config_x86",
 }