ART: Fix testrunner test reporting
Fixes breakage when manually invoking the testrunner to reproduce a
failure. The test names printed and the regular expression parser did
not line up for the cdex option.
Test: art/test/testrunner/testrunner.py test-art-host-run-test-debug-prebuild-speed-profile-no-relocate-ntrace-cms-checkjni-picimage-npictest-ndebuggable-no-jvmti-cdex-fast-710-varhandle-creation32
Change-Id: I93a58caa76a568496361f8777e55fbe586496f3b
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 8a1e06c..3d173f5 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -357,11 +357,12 @@
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 @@
test_name += pictest + '-'
test_name += debuggable + '-'
test_name += jvmti + '-'
+ test_name += cdex_level + '-'
test_name += test
test_name += address_size