Add `CtsLibcoreOjTestCases` to the generated ART MTS definition.
Introduce an additional shard (shard 02) for CTS Libcore OJ tests
(`CtsLibcoreOjTestCases`).
Test: m mts && mts-tradefed run commandAndExit mts-art
Test: m mts && mts-tradefed run commandAndExit mts-art-shard-02
Bug: 182575630
Bug: 167385698
Change-Id: I3399476f04240d9e8c43af84996b1ece0c661927
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index a3db507..4b22d3d 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -804,11 +804,17 @@
["TODO(rpl): Find a way to express this list in a more concise fashion."])
mts_test_shards.append(art_run_test_shard)
- # Libcore CTS test shard.
- libcore_cts_test_shard_num = len(mts_test_shards)
- libcore_cts_test_shard = self.create_mts_test_shard(
- "Libcore CTS tests", ["CtsLibcoreTestCases"], libcore_cts_test_shard_num, 2020)
- mts_test_shards.append(libcore_cts_test_shard)
+ # CTS Libcore non-OJ tests (`CtsLibcoreTestCases`) shard.
+ cts_libcore_tests_shard_num = len(mts_test_shards)
+ cts_libcore_tests_shard = self.create_mts_test_shard(
+ "CTS Libcore non-OJ tests", ["CtsLibcoreTestCases"], cts_libcore_tests_shard_num, 2020)
+ mts_test_shards.append(cts_libcore_tests_shard)
+
+ # CTS Libcore OJ tests (`CtsLibcoreOjTestCases`) shard.
+ cts_libcore_oj_tests_shard_num = len(mts_test_shards)
+ cts_libcore_oj_tests_shard = self.create_mts_test_shard(
+ "CTS Libcore OJ tests", ["CtsLibcoreOjTestCases"], cts_libcore_oj_tests_shard_num, 2021)
+ mts_test_shards.append(cts_libcore_oj_tests_shard)
for s in mts_test_shards:
s.regen_test_plan_file()