Add tzdata relevant tests to MTS.
Test: m mts, mts-tradefed run mts-tzdata (results below)
============================================
================= Results ==================
=============== Consumed Time ==============
armeabi-v7a CtsLibcoreOjTestCases: 1h 25m 31s
armeabi-v7a CtsLibcoreTestCases: 56m 36s
arm64-v8a CtsLibcoreOjTestCases: 54m 25s
arm64-v8a CtsLibcoreTestCases: 30m 13s
armeabi-v7a CtsIcuTestCases: 11m 47s
arm64-v8a CtsIcuTestCases: 10m 38s
Total aggregated tests run time: 4h 9m 12s
============== TOP 6 Slow Modules ==============
armeabi-v7a CtsLibcoreOjTestCases: 0.78 tests/sec [3979 tests / 5131246 msec]
arm64-v8a CtsLibcoreOjTestCases: 1.22 tests/sec [3979 tests / 3265410 msec]
armeabi-v7a CtsIcuTestCases: 6.30 tests/sec [4458 tests / 707653 msec]
armeabi-v7a CtsLibcoreTestCases: 6.93 tests/sec [23521 tests / 3396456 msec]
arm64-v8a CtsIcuTestCases: 6.98 tests/sec [4458 tests / 638424 msec]
arm64-v8a CtsLibcoreTestCases: 12.97 tests/sec [23521 tests / 1813253 msec]
============== Modules Preparation Times ==============
armeabi-v7a CtsIcuTestCases => prep = 2876 ms || clean = 283 ms
arm64-v8a CtsLibcoreTestCases => prep = 4107 ms || clean = 802 ms
armeabi-v7a CtsLibcoreOjTestCases => prep = 2613 ms || clean = 771 ms
arm64-v8a CtsIcuTestCases => prep = 2280 ms || clean = 432 ms
armeabi-v7a CtsLibcoreTestCases => prep = 4344 ms || clean = 577 ms
arm64-v8a CtsLibcoreOjTestCases => prep = 3023 ms || clean = 758 ms
Total preparation time: 19s || Total tear down time: 3s
=======================================================
=============== Summary ===============
Total Run time: 4h 9m 33s
6/6 modules completed
Total Tests : 63916
PASSED : 63848
FAILED : 0
IGNORED : 54
ASSUMPTION_FAILURE: 14
============== End of Results ==============
============================================
Bug: 138605385
Bug: 123411735
Merged-In: Ia2b097fe028c074965af46b9fe6c81410ac7db19
Change-Id: I24d979ae1eb08f5068a57014091cc7ef37317870
(cherry picked from commit b6e9c62c5f2e8b742ffd50cf2546b3f902b9b7a3)
diff --git a/tests/jdwp/runner/host-side/Android.bp b/tests/jdwp/runner/host-side/Android.bp
index e421ce0..597ae6f 100644
--- a/tests/jdwp/runner/host-side/Android.bp
+++ b/tests/jdwp/runner/host-side/Android.bp
@@ -35,5 +35,6 @@
"cts",
"vts",
"general-tests",
+ "mts",
],
}
diff --git a/tests/libcore/luni/Android.mk b/tests/libcore/luni/Android.mk
index 2ba08cb..210ba0f 100644
--- a/tests/libcore/luni/Android.mk
+++ b/tests/libcore/luni/Android.mk
@@ -55,7 +55,7 @@
LOCAL_HOST_REQUIRED_MODULES := cts-dalvik-host-test-runner
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests mts
# NOTE: virtualdeviceknownfailures.txt is only used for simulated/cloud-based
# continuous build configurations, so it's not referenced in AndroidTest.xml
diff --git a/tests/libcore/ojluni/Android.mk b/tests/libcore/ojluni/Android.mk
index 8354615..437488e 100644
--- a/tests/libcore/ojluni/Android.mk
+++ b/tests/libcore/ojluni/Android.mk
@@ -45,7 +45,7 @@
LOCAL_MULTILIB := both
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests mts
LOCAL_JAVA_RESOURCE_FILES := libcore/expectations/knownfailures.txt
diff --git a/tests/libcore/runner/Android.mk b/tests/libcore/runner/Android.mk
index 093779b..c260de7 100644
--- a/tests/libcore/runner/Android.mk
+++ b/tests/libcore/runner/Android.mk
@@ -34,6 +34,6 @@
LOCAL_PROGUARD_ENABLED := disabled
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests mts
include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/tests/icu/Android.mk b/tests/tests/icu/Android.mk
index 204d97f..8f4fc28 100644
--- a/tests/tests/icu/Android.mk
+++ b/tests/tests/icu/Android.mk
@@ -34,7 +34,7 @@
android-icu4j-tests
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests mts
LOCAL_PACKAGE_NAME := CtsIcuTestCases
LOCAL_PRIVATE_PLATFORM_APIS := true
