Swich TEST_MAPPING config to unit_tests:true
All unit_tests:true are run in presubmit which avoids
the explicit definition of TEST_MAPPING.
Test: presubmit runs all those tests
Bug: 175408655
Change-Id: I47a41f940b99a10af584c8f6bb059cca88373d3a
diff --git a/input_tools/android/common/Android.bp b/input_tools/android/common/Android.bp
index 2ecd9b8..a9b906b 100644
--- a/input_tools/android/common/Android.bp
+++ b/input_tools/android/common/Android.bp
@@ -35,10 +35,12 @@
name: "tztools_common_tests",
srcs: ["src/test/java/**/*.java"],
+ test_options: {
+ unit_test: true,
+ },
static_libs: [
"junit",
"tztools_common",
"tztools_common_testing",
],
- test_suites: ["general-tests"],
}
diff --git a/input_tools/android/common/TEST_MAPPING b/input_tools/android/common/TEST_MAPPING
deleted file mode 100644
index 042a54f..0000000
--- a/input_tools/android/common/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "presubmit": [
- {
- "name" : "tztools_common_tests",
- "host" : true
- }
- ]
-}
diff --git a/input_tools/android/telephonylookup_generator/Android.bp b/input_tools/android/telephonylookup_generator/Android.bp
index 00dcc8c..adf09dd 100644
--- a/input_tools/android/telephonylookup_generator/Android.bp
+++ b/input_tools/android/telephonylookup_generator/Android.bp
@@ -42,10 +42,12 @@
name: "telephonylookup_generator_tests",
srcs: ["src/test/java/**/*.java"],
+ test_options: {
+ unit_test: true,
+ },
static_libs: [
"junit",
"telephonylookup_generator",
"tztools_common_testing",
],
- test_suites: ["general-tests"],
}
diff --git a/input_tools/android/telephonylookup_generator/TEST_MAPPING b/input_tools/android/telephonylookup_generator/TEST_MAPPING
deleted file mode 100644
index 9916c9c..0000000
--- a/input_tools/android/telephonylookup_generator/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "presubmit": [
- {
- "name" : "telephonylookup_generator_tests",
- "host" : true
- }
- ]
-}
diff --git a/input_tools/android/tzids/Android.bp b/input_tools/android/tzids/Android.bp
index c4750c8..a5656d0 100644
--- a/input_tools/android/tzids/Android.bp
+++ b/input_tools/android/tzids/Android.bp
@@ -34,9 +34,11 @@
name: "tzids_tests",
srcs: ["src/test/java/**/*.java"],
+ test_options: {
+ unit_test: true,
+ },
static_libs: [
"junit",
"tzids",
],
- test_suites: ["general-tests"],
}
diff --git a/input_tools/android/tzids/TEST_MAPPING b/input_tools/android/tzids/TEST_MAPPING
deleted file mode 100644
index 89921f9..0000000
--- a/input_tools/android/tzids/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "presubmit": [
- {
- "name" : "tzids_tests",
- "host" : true
- }
- ]
-}
diff --git a/input_tools/android/tzlookup_generator/Android.bp b/input_tools/android/tzlookup_generator/Android.bp
index cc15ada..f29edfa 100644
--- a/input_tools/android/tzlookup_generator/Android.bp
+++ b/input_tools/android/tzlookup_generator/Android.bp
@@ -51,10 +51,12 @@
name: "tzlookup_tests",
srcs: ["src/test/java/**/*.java"],
+ test_options: {
+ unit_test: true,
+ },
static_libs: [
"junit",
"tzlookup",
"tztools_common_testing",
],
- test_suites: ["general-tests"],
}
diff --git a/input_tools/android/tzlookup_generator/TEST_MAPPING b/input_tools/android/tzlookup_generator/TEST_MAPPING
deleted file mode 100644
index a66d9c7..0000000
--- a/input_tools/android/tzlookup_generator/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "presubmit": [
- {
- "name" : "tzlookup_tests",
- "host" : true
- }
- ]
-}