4 files changed, 52 insertions, 14 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",
 }
 
diff --git a/ltp/testcase/tools/configs/disabled_tests.py b/ltp/testcase/tools/configs/disabled_tests.py
index e4969959..f54d8292 100644
--- a/ltp/testcase/tools/configs/disabled_tests.py
+++ b/ltp/testcase/tools/configs/disabled_tests.py
@@ -26,8 +26,6 @@ DISABLED_TESTS = [
     'cve.cve-2017-2636_64bit',  # b/191224903
     'cve.cve-2019-8912_32bit',  # b/191224904
     'cve.cve-2019-8912_64bit',  # b/191224904
-    'cve.cve-2020-14416_32bit',  # b/191227026
-    'cve.cve-2020-14416_64bit',  # b/191227026
     'cve.cve-2021-3444_32bit',  # b/191226866
     'cve.cve-2021-3444_64bit',  # b/191226866
     'kernel_misc.zram01_32bit',  # b/191226875
diff --git a/ltp/testcase/tools/configs/stable_tests.py b/ltp/testcase/tools/configs/stable_tests.py
index 2acec753..e652471e 100644
--- a/ltp/testcase/tools/configs/stable_tests.py
+++ b/ltp/testcase/tools/configs/stable_tests.py
@@ -251,6 +251,8 @@ STABLE_TESTS = [
     ('cve.cve-2020-11494_64bit', True),
     ('cve.cve-2020-14386_32bit', True),
     ('cve.cve-2020-14386_64bit', True),
+    ('cve.cve-2020-14416_32bit', True),
+    ('cve.cve-2020-14416_64bit', True),
     ('cve.cve-2020-29373_32bit', True),
     ('cve.cve-2020-29373_64bit', True),
     ('dio.dio01_32bit', False),
@@ -764,6 +766,8 @@ STABLE_TESTS = [
     ('syscalls.close02_64bit', True),
     ('syscalls.close08_32bit', True),
     ('syscalls.close08_64bit', True),
+    ('syscalls.close_range01_32bit', True),
+    ('syscalls.close_range01_64bit', True),
     ('syscalls.close_range02_32bit', True),
     ('syscalls.close_range02_64bit', True),
     ('syscalls.connect01_32bit', True),