Put all our tests to general-tests
... because the tests can be built for the generic test_suites target.
Bug: N/A
Test: watch TH
Change-Id: I5a60723a964ac3b8fb92b395f544a9b84f49e9e7
diff --git a/authfs/Android.bp b/authfs/Android.bp
index ef78d4e..935ed5c 100644
--- a/authfs/Android.bp
+++ b/authfs/Android.bp
@@ -63,7 +63,7 @@
rust_test {
name: "authfs_device_test_src_lib",
defaults: ["authfs_defaults"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
data: [":authfs_test_files"],
}
diff --git a/compos/Android.bp b/compos/Android.bp
index 0bcbcdd..d4fccbb 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -49,5 +49,5 @@
rust_test {
name: "compsvc_device_tests",
defaults: ["compsvc_defaults"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
}
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index 1878c87..e4827aa 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -62,7 +62,7 @@
rust_test {
name: "microdroid_manager_test",
defaults: ["microdroid_manager_defaults"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
rustlibs: [
"libtempfile",
],
diff --git a/tests/Android.bp b/tests/Android.bp
index 0b3a821..cf720f1 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -23,7 +23,7 @@
cc_test {
name: "VirtualizationTestCases",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
srcs: [
"common.cc",
"vsock_test.cc",
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index 968c991..d1318b5 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -5,7 +5,7 @@
java_test_host {
name: "MicrodroidHostTestCases",
srcs: ["java/**/*.java"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
libs: [
"tradefed",
],
diff --git a/tests/hostside/helper/Android.bp b/tests/hostside/helper/Android.bp
index 48dbcac..aa748ab 100644
--- a/tests/hostside/helper/Android.bp
+++ b/tests/hostside/helper/Android.bp
@@ -7,7 +7,7 @@
host_supported: true,
device_supported: false,
srcs: ["java/**/*.java"],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
libs: [
"tradefed",
"compatibility-tradefed",
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 40d72fe..7dca024 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -4,7 +4,7 @@
android_test {
name: "MicrodroidTestApp",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
srcs: ["src/java/**/*.java"],
static_libs: [
"androidx.test.runner",