diff options
Diffstat (limited to 'test/testrunner/testrunner.py')
| -rwxr-xr-x | test/testrunner/testrunner.py | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 4d3b3b1087..45c3f88ecf 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -31,7 +31,7 @@ dependencies: There are various options to invoke the script which are: -t: Either the test name as in art/test or the test name including the variant information. Eg, "-t 001-HelloWorld", - "-t test-art-host-run-test-debug-prebuild-optimizing-relocate-ntrace-cms-checkjni-picimage-npictest-ndebuggable-001-HelloWorld32" + "-t test-art-host-run-test-debug-prebuild-optimizing-relocate-ntrace-cms-checkjni-picimage-ndebuggable-001-HelloWorld32" -j: Number of thread workers to be used. Eg - "-j64" --dry-run: Instead of running the test name, just print its name. --verbose @@ -139,7 +139,6 @@ def gather_test_info(): global TOTAL_VARIANTS_SET global DISABLED_TEST_CONTAINER # TODO: Avoid duplication of the variant names in different lists. - VARIANT_TYPE_DICT['pictest'] = {'pictest', 'npictest'} VARIANT_TYPE_DICT['run'] = {'ndebug', 'debug'} VARIANT_TYPE_DICT['target'] = {'target', 'host', 'jvm'} VARIANT_TYPE_DICT['trace'] = {'trace', 'ntrace', 'stream'} @@ -181,7 +180,6 @@ def setup_test_env(): # These are the default variant-options we will use if nothing in the group is specified. default_variants = { 'target': {'host', 'target'}, - 'pictest': {'npictest'}, 'prebuild': {'prebuild'}, 'cdex_level': {'cdex-fast'}, 'jvmti': { 'no-jvmti'}, @@ -195,7 +193,6 @@ def setup_test_env(): 'gc': {'cms'}, 'jni': {'checkjni'}, 'image': {'picimage'}, - 'pictest': {'pictest'}, 'debuggable': {'ndebuggable'}, 'run': {'debug'}, # address_sizes_target depends on the target so it is dealt with below. @@ -346,7 +343,7 @@ def run_tests(tests): user_input_variants['prebuild'], user_input_variants['compiler'], user_input_variants['relocate'], user_input_variants['trace'], user_input_variants['gc'], user_input_variants['jni'], - user_input_variants['image'], user_input_variants['pictest'], + user_input_variants['image'], user_input_variants['debuggable'], user_input_variants['jvmti'], user_input_variants['cdex_level']) return config @@ -359,13 +356,13 @@ def run_tests(tests): 'prebuild': [''], 'compiler': [''], 'relocate': [''], 'trace': [''], 'gc': [''], 'jni': [''], - 'image': [''], 'pictest': [''], + 'image': [''], 'debuggable': [''], 'jvmti': [''], 'cdex_level': ['']}) def start_combination(config_tuple, address_size): test, target, run, prebuild, compiler, relocate, trace, gc, \ - jni, image, pictest, debuggable, jvmti, cdex_level = config_tuple + jni, image, debuggable, jvmti, cdex_level = config_tuple if stop_testrunner: # When ART_TEST_KEEP_GOING is set to false, then as soon as a test @@ -387,7 +384,6 @@ def run_tests(tests): test_name += gc + '-' test_name += jni + '-' test_name += image + '-' - test_name += pictest + '-' test_name += debuggable + '-' test_name += jvmti + '-' test_name += cdex_level + '-' @@ -395,7 +391,7 @@ def run_tests(tests): test_name += address_size variant_set = {target, run, prebuild, compiler, relocate, trace, gc, jni, - image, pictest, debuggable, jvmti, cdex_level, address_size} + image, debuggable, jvmti, cdex_level, address_size} options_test = options_all @@ -465,9 +461,6 @@ def run_tests(tests): elif image == 'multipicimage': options_test += ' --multi-image' - if pictest == 'pictest': - options_test += ' --pic-test' - if debuggable == 'debuggable': options_test += ' --debuggable' @@ -819,7 +812,7 @@ def parse_test_name(test_name): It supports two types of test_name: 1) Like 001-HelloWorld. In this case, it will just verify if the test actually exists and if it does, it returns the testname. - 2) Like test-art-host-run-test-debug-prebuild-interpreter-no-relocate-ntrace-cms-checkjni-picimage-npictest-ndebuggable-001-HelloWorld32 + 2) Like test-art-host-run-test-debug-prebuild-interpreter-no-relocate-ntrace-cms-checkjni-picimage-ndebuggable-001-HelloWorld32 In this case, it will parse all the variants and check if they are placed correctly. If yes, it will set the various VARIANT_TYPES to use the variants required to run the test. Again, it returns the test_name @@ -843,7 +836,6 @@ def parse_test_name(test_name): regex += '(' + '|'.join(VARIANT_TYPE_DICT['gc']) + ')-' regex += '(' + '|'.join(VARIANT_TYPE_DICT['jni']) + ')-' regex += '(' + '|'.join(VARIANT_TYPE_DICT['image']) + ')-' - regex += '(' + '|'.join(VARIANT_TYPE_DICT['pictest']) + ')-' regex += '(' + '|'.join(VARIANT_TYPE_DICT['debuggable']) + ')-' regex += '(' + '|'.join(VARIANT_TYPE_DICT['jvmti']) + ')-' regex += '(' + '|'.join(VARIANT_TYPE_DICT['cdex_level']) + ')-' @@ -860,12 +852,11 @@ def parse_test_name(test_name): _user_input_variants['gc'].add(match.group(7)) _user_input_variants['jni'].add(match.group(8)) _user_input_variants['image'].add(match.group(9)) - _user_input_variants['pictest'].add(match.group(10)) - _user_input_variants['debuggable'].add(match.group(11)) - _user_input_variants['jvmti'].add(match.group(12)) - _user_input_variants['cdex_level'].add(match.group(13)) - _user_input_variants['address_sizes'].add(match.group(15)) - return {match.group(14)} + _user_input_variants['debuggable'].add(match.group(10)) + _user_input_variants['jvmti'].add(match.group(11)) + _user_input_variants['cdex_level'].add(match.group(12)) + _user_input_variants['address_sizes'].add(match.group(14)) + return {match.group(13)} raise ValueError(test_name + " is not a valid test") |