diff options
| -rw-r--r-- | test/testrunner/env.py | 2 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 0b69718f93..2fde3576cc 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -179,6 +179,8 @@ ART_TEST_ANDROID_ROOT = env.get('ART_TEST_ANDROID_ROOT') ART_TEST_WITH_STRACE = getEnvBoolean('ART_TEST_DEBUG_GC', False) +EXTRA_DISABLED_TESTS = set(env.get("ART_TEST_RUN_TEST_SKIP", "").split()) + TARGET_2ND_ARCH = get_build_var('TARGET_2ND_ARCH') TARGET_ARCH = get_build_var('TARGET_ARCH') if TARGET_2ND_ARCH: diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 5a6114e3cc..a91607e56b 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -605,6 +605,8 @@ def is_test_disabled(test, variant_set): """ if dry_run: return True + if test in env.EXTRA_DISABLED_TESTS: + return True variants_list = DISABLED_TEST_CONTAINER.get(test, {}) for variants in variants_list: variants_present = True @@ -731,12 +733,15 @@ def parse_option(): parser.add_option(flag, action='store_true', dest=flag_dest) parser.add_option('--verbose', '-v', action='store_true', dest='verbose') parser.add_option('--dry-run', action='store_true', dest='dry_run') + parser.add_option("--skip", action="append", dest="skips", default=[], + help="Skip the given test in all circumstances.") parser.add_option('-b', '--build-dependencies', action='store_true', dest='build') parser.add_option('--gdb', action='store_true', dest='gdb') parser.add_option('--gdb-arg', dest='gdb_arg') options = parser.parse_args()[0] test = '' + env.EXTRA_DISABLED_TESTS.update(set(options.skips)) if options.test: test = parse_test_name(options.test) if options.pictest: |