diff options
| -rw-r--r-- | test/testrunner/env.py | 8 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 57 |
2 files changed, 34 insertions, 31 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 1dc8ce552c..0b69718f93 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -100,7 +100,7 @@ ART_TEST_INTERPRETER_ACCESS_CHECKS = getEnvBoolean('ART_TEST_INTERPRETER_ACCESS_ ART_TEST_JIT = getEnvBoolean('ART_TEST_JIT', ART_TEST_FULL) # Do you want optimizing compiler tests run? -ART_TEST_OPTIMIZING = getEnvBoolean('ART_TEST_OPTIMIZING', True) +ART_TEST_OPTIMIZING = getEnvBoolean('ART_TEST_OPTIMIZING', ART_TEST_FULL) # Do you want to test the optimizing compiler with graph coloring register allocation? ART_TEST_OPTIMIZING_GRAPH_COLOR = getEnvBoolean('ART_TEST_OPTIMIZING_GRAPH_COLOR', ART_TEST_FULL) @@ -129,13 +129,13 @@ ART_TEST_JNI_FORCECOPY = getEnvBoolean('ART_TEST_JNI_FORCECOPY', ART_TEST_FULL) ART_TEST_RUN_TEST_RELOCATE = getEnvBoolean('ART_TEST_RUN_TEST_RELOCATE', ART_TEST_FULL) # Do you want run-tests with prebuilding? -ART_TEST_RUN_TEST_PREBUILD = getEnvBoolean('ART_TEST_RUN_TEST_PREBUILD', True) +ART_TEST_RUN_TEST_PREBUILD = getEnvBoolean('ART_TEST_RUN_TEST_PREBUILD', ART_TEST_FULL) # Do you want run-tests with no prebuilding enabled run? ART_TEST_RUN_TEST_NO_PREBUILD = getEnvBoolean('ART_TEST_RUN_TEST_NO_PREBUILD', ART_TEST_FULL) # Do you want run-tests with a pregenerated core.art? -ART_TEST_RUN_TEST_IMAGE = getEnvBoolean('ART_TEST_RUN_TEST_IMAGE', True) +ART_TEST_RUN_TEST_IMAGE = getEnvBoolean('ART_TEST_RUN_TEST_IMAGE', ART_TEST_FULL) # Do you want run-tests without a pregenerated core.art? ART_TEST_RUN_TEST_NO_IMAGE = getEnvBoolean('ART_TEST_RUN_TEST_NO_IMAGE', ART_TEST_FULL) @@ -148,7 +148,7 @@ ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT = getEnvBoolean('ART_TEST_RUN_TEST_RELOCA ART_TEST_RUN_TEST_NO_DEX2OAT = getEnvBoolean('ART_TEST_RUN_TEST_NO_DEX2OAT', ART_TEST_FULL) # Do you want run-tests with libartd.so? -ART_TEST_RUN_TEST_DEBUG = getEnvBoolean('ART_TEST_RUN_TEST_DEBUG', True) +ART_TEST_RUN_TEST_DEBUG = getEnvBoolean('ART_TEST_RUN_TEST_DEBUG', ART_TEST_FULL) # Do you want run-tests with libart.so? ART_TEST_RUN_TEST_NDEBUG = getEnvBoolean('ART_TEST_RUN_TEST_NDEBUG', ART_TEST_FULL) diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 81b7953f3b..92ecc9d56d 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -166,12 +166,12 @@ def setup_test_env(): TARGET_TYPES.add('host') TARGET_TYPES.add('target') - if env.ART_TEST_RUN_TEST_PREBUILD: - PREBUILD_TYPES.add('prebuild') if env.ART_TEST_RUN_TEST_NO_PREBUILD: PREBUILD_TYPES.add('no-prebuild') if env.ART_TEST_RUN_TEST_NO_DEX2OAT: PREBUILD_TYPES.add('no-dex2oat') + if env.ART_TEST_RUN_TEST_PREBUILD or not PREBUILD_TYPES: # Default + PREBUILD_TYPES.add('prebuild') if env.ART_TEST_INTERPRETER_ACCESS_CHECKS: COMPILER_TYPES.add('interp-ac') @@ -179,42 +179,39 @@ def setup_test_env(): COMPILER_TYPES.add('interpreter') if env.ART_TEST_JIT: COMPILER_TYPES.add('jit') - - if env.ART_TEST_OPTIMIZING: - COMPILER_TYPES.add('optimizing') - OPTIMIZING_COMPILER_TYPES.add('optimizing') if env.ART_TEST_OPTIMIZING_GRAPH_COLOR: COMPILER_TYPES.add('regalloc_gc') OPTIMIZING_COMPILER_TYPES.add('regalloc_gc') + if env.ART_TEST_OPTIMIZING or not COMPILER_TYPES: # Default + COMPILER_TYPES.add('optimizing') + OPTIMIZING_COMPILER_TYPES.add('optimizing') - if not RELOCATE_TYPES: - RELOCATE_TYPES.add('no-relocate') if env.ART_TEST_RUN_TEST_RELOCATE: RELOCATE_TYPES.add('relocate') if env.ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT: RELOCATE_TYPES.add('relocate-npatchoat') + if not RELOCATE_TYPES: # Default + RELOCATE_TYPES.add('no-relocate') - if not TRACE_TYPES: - TRACE_TYPES.add('ntrace') if env.ART_TEST_TRACE: TRACE_TYPES.add('trace') if env.ART_TEST_TRACE_STREAM: TRACE_TYPES.add('stream') + if not TRACE_TYPES: # Default + TRACE_TYPES.add('ntrace') - if not GC_TYPES: - GC_TYPES.add('cms') if env.ART_TEST_GC_STRESS: GC_TYPES.add('gcstress') if env.ART_TEST_GC_VERIFY: GC_TYPES.add('gcverify') + if not GC_TYPES: # Default + GC_TYPES.add('cms') - if not JNI_TYPES: - JNI_TYPES.add('checkjni') if env.ART_TEST_JNI_FORCECOPY: JNI_TYPES.add('forcecopy') + if not JNI_TYPES: # Default + JNI_TYPES.add('checkjni') - if env.ART_TEST_RUN_TEST_IMAGE: - IMAGE_TYPES.add('picimage') if env.ART_TEST_RUN_TEST_NO_IMAGE: IMAGE_TYPES.add('no-image') if env.ART_TEST_RUN_TEST_MULTI_IMAGE: @@ -223,22 +220,23 @@ def setup_test_env(): IMAGE_TYPES.add('npicimage') if env.ART_TEST_RUN_TEST_MULTI_IMAGE: IMAGE_TYPES.add('multinpicimage') + if env.ART_TEST_RUN_TEST_IMAGE or not IMAGE_TYPES: # Default + IMAGE_TYPES.add('picimage') - if not PICTEST_TYPES: - PICTEST_TYPES.add('npictest') if env.ART_TEST_PIC_TEST: PICTEST_TYPES.add('pictest') + if not PICTEST_TYPES: # Default + PICTEST_TYPES.add('npictest') - if env.ART_TEST_RUN_TEST_DEBUG: - RUN_TYPES.add('debug') if env.ART_TEST_RUN_TEST_NDEBUG: RUN_TYPES.add('ndebug') - - if not DEBUGGABLE_TYPES: - DEBUGGABLE_TYPES.add('ndebuggable') + if env.ART_TEST_RUN_TEST_DEBUG or not RUN_TYPES: # Default + RUN_TYPES.add('debug') if env.ART_TEST_RUN_TEST_DEBUGGABLE: DEBUGGABLE_TYPES.add('debuggable') + if not DEBUGGABLE_TYPES: # Default + DEBUGGABLE_TYPES.add('ndebuggable') if not ADDRESS_SIZES: ADDRESS_SIZES_TARGET['target'].add(env.ART_PHONY_TEST_TARGET_SUFFIX) @@ -612,8 +610,12 @@ def parse_test_name(test_name): variants required to run the test. Again, it returns the test_name without the variant information like 001-HelloWorld. """ - if test_name in RUN_TEST_SET: - return {test_name} + test_set = set() + for test in RUN_TEST_SET: + if test.startswith(test_name): + test_set.add(test) + if test_set: + return test_set regex = '^test-art-' regex += '(' + '|'.join(VARIANT_TYPE_DICT['target']) + ')-' @@ -645,6 +647,7 @@ def parse_test_name(test_name): DEBUGGABLE_TYPES.add(match.group(11)) ADDRESS_SIZES.add(match.group(13)) return {match.group(12)} + raise ValueError(test_name + " is not a valid test") def parse_option(): @@ -788,10 +791,10 @@ def main(): sys.exit(0) except SystemExit: pass - except: + except Exception, e: print_analysis() + print_text(str(e)) sys.exit(1) - if __name__ == '__main__': main() |