Set native-test-timeout for dex2oat test.
On hwasan builds, the default timeout of 1min was not enough and the
test run was interrupted early.
Test: atest art_standalone_dex2oat_tests on flame_hwasan
Bug: 228881278
Change-Id: I6c5bc7748b95aa0976b643814731b3919527fa91
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5db31cd..789e809 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3918,6 +3918,9 @@
"name": "art_standalone_compiler_tests"
},
{
+ "name": "art_standalone_dex2oat_tests"
+ },
+ {
"name": "art_standalone_dexdump_tests"
},
{
diff --git a/dex2oat/art_standalone_dex2oat_tests.xml b/dex2oat/art_standalone_dex2oat_tests.xml
index 8fb120c..65915ec 100644
--- a/dex2oat/art_standalone_dex2oat_tests.xml
+++ b/dex2oat/art_standalone_dex2oat_tests.xml
@@ -64,6 +64,9 @@
</target_preparer>
<test class="com.android.tradefed.testtype.GTest" >
+ <option name="native-test-timeout" value="5m" />
+ <!-- Set this to the same as native-test-timeout to effectively disable per test case timeout. -->
+ <option name="test-case-timeout" value="5m" />
<option name="native-test-device-path" value="/data/local/tmp/art_standalone_dex2oat_tests" />
<option name="module-name" value="art_standalone_dex2oat_tests" />
<option name="ld-library-path-32" value="/apex/com.android.art/lib" />
@@ -79,8 +82,6 @@
<option name="mainline-module-package-name" value="com.android.art" />
</object>
- <!-- Skip on HWASan. TODO(b/230394041): Re-enable -->
- <object type="module_controller" class="com.android.tradefed.testtype.suite.module.SkipHWASanModuleController" />
<!-- Only run tests if the device under test is SDK version 31 (Android 12) or above. -->
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk31ModuleController" />
</configuration>
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 89f1124..aec34e4 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -211,7 +211,6 @@
known_failing_on_hwasan_tests = frozenset([
"BootImageProfileTest", # b/232012605
"CtsJdwpTestCases", # times out
- "art_standalone_dex2oat_tests", # b/228881278
])
# ART gtests that do not need root access to the device.