summaryrefslogtreecommitdiff
path: root/test/testrunner/testrunner.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/testrunner/testrunner.py')
-rwxr-xr-xtest/testrunner/testrunner.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 93998579f3..3d173f5571 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -185,7 +185,7 @@ def setup_test_env():
_user_input_variants['prebuild'].add('prebuild')
if not _user_input_variants['cdex_level']: # Default
- _user_input_variants['cdex_level'].add('cdex-none')
+ _user_input_variants['cdex_level'].add('cdex-fast')
# By default only run without jvmti
if not _user_input_variants['jvmti']:
@@ -357,11 +357,12 @@ def run_tests(tests):
while threading.active_count() > 2:
time.sleep(0.1)
return
+ # NB The order of components here should match the order of
+ # components in the regex parser in parse_test_name.
test_name = 'test-art-'
test_name += target + '-run-test-'
test_name += run + '-'
test_name += prebuild + '-'
- test_name += cdex_level + '-'
test_name += compiler + '-'
test_name += relocate + '-'
test_name += trace + '-'
@@ -371,6 +372,7 @@ def run_tests(tests):
test_name += pictest + '-'
test_name += debuggable + '-'
test_name += jvmti + '-'
+ test_name += cdex_level + '-'
test_name += test
test_name += address_size