Revert "Exclude `com.android.org.conscrypt.NativeCryptoArgTest` ..."
Revert submission 1818000-exclude-native-crypto-arg-test-from-art-mts
Reason for revert: `Test NativeCryptoArgTest` is now disabled in
affected test configurations (see cl/399946691), which is more precise than disabling it at the ART MTS level.
Reverted Changes:
I74a0f05a5:Exclude `com.android.org.conscrypt.NativeCryptoArg...
Ifbb088244:Regenerate the ART MTS definition to exclude test ...
Bug: b/198606382
Change-Id: I010a2b6957e84f52b9d33ef4cc7cce6f7121a659
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index c98b0f4..00ab588 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -691,23 +691,20 @@
f.write(test_mapping_contents)
f.write("\n")
- def create_mts_test_shard(self, description, tests, shard_num, copyright_year,
- excluded_tests = [], comments = []):
+ def create_mts_test_shard(self, description, tests, shard_num, copyright_year, comments = []):
"""Factory method instantiating an `MtsTestShard`."""
- return self.MtsTestShard(self.mts_config_dir, description, tests, shard_num, copyright_year,
- excluded_tests, comments)
+ return self.MtsTestShard(self.mts_config_dir,
+ description, tests, shard_num, copyright_year, comments)
class MtsTestShard:
"""Class encapsulating data and generation logic for an ART MTS test shard."""
- def __init__(self, mts_config_dir, description, tests, shard_num, copyright_year,
- excluded_tests, comments):
+ def __init__(self, mts_config_dir, description, tests, shard_num, copyright_year, comments):
self.mts_config_dir = mts_config_dir
self.description = description
self.tests = tests
self.shard_num = shard_num
self.copyright_year = copyright_year
- self.excluded_tests = excluded_tests
self.comments = comments
def shard_id(self):
@@ -787,23 +784,6 @@
for t in self.tests:
append_test_declaration(t)
- # Tests exclusions.
- # -----------------
-
- def append_test_exclusions(test_name, test_comment):
- xml_comment = root.createComment(f" {test_comment} ")
- configuration.appendChild(xml_comment)
- option = root.createElement("option")
- option.setAttribute("name", "compatibility:exclude-filter")
- option.setAttribute("value", test_name)
- configuration.appendChild(option)
-
- if self.excluded_tests:
- xml_comment = root.createComment(" Excluded tests. ")
- configuration.appendChild(xml_comment)
- for (test_name, test_comment) in self.excluded_tests:
- append_test_exclusions(test_name, test_comment)
-
# `MainlineTestModuleController` configurations.
# ----------------------------------------------
@@ -886,17 +866,13 @@
art_tests_shard_i_tests.extend(art_gtest_user_module_names)
art_tests_shard_i = self.create_mts_test_shard(
"ART run-tests", art_tests_shard_i_tests, i, 2020,
- comments = ["TODO(rpl): Find a way to express this list in a more concise fashion."])
+ ["TODO(rpl): Find a way to express this list in a more concise fashion."])
mts_test_shards.append(art_tests_shard_i)
# 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,
- excluded_tests = [
- ("CtsLibcoreTestCases com.android.org.conscrypt.NativeCryptoArgTest",
- "Test requires an updated Conscrypt and is not really relevant to ART (b/198606382).")
- ])
+ "CTS Libcore non-OJ tests", ["CtsLibcoreTestCases"], cts_libcore_tests_shard_num, 2020)
mts_test_shards.append(cts_libcore_tests_shard)
# Other CTS Libcore tests shard.