diff options
| -rw-r--r-- | test/testrunner/env.py | 2 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 4336d7772f..ed4b4a9f3e 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -178,6 +178,8 @@ ART_TEST_WITH_STRACE = getEnvBoolean('ART_TEST_DEBUG_GC', False) EXTRA_DISABLED_TESTS = set(env.get("ART_TEST_RUN_TEST_SKIP", "").split()) +ART_TEST_RUN_TEST_BUILD = getEnvBoolean('ART_TEST_RUN_TEST_BUILD', False) + 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 c22b0be9f4..9c8d3b870c 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -704,7 +704,6 @@ def parse_test_name(test_name): return {match.group(12)} raise ValueError(test_name + " is not a valid test") - def parse_option(): global verbose global dry_run @@ -726,7 +725,15 @@ def parse_option(): parser.add_argument('--dry-run', action='store_true', dest='dry_run') parser.add_argument("--skip", action="append", dest="skips", default=[], help="Skip the given test in all circumstances.") - parser.add_argument('-b', '--build-dependencies', action='store_true', dest='build') + parser.add_argument('--no-build-dependencies', + action='store_false', dest='build', + help="Don't build dependencies under any circumstances. This is the " + + "behavior if ART_TEST_RUN_TEST_ALWAYS_BUILD is not set to 'true'.") + parser.add_argument('-b', '--build-dependencies', + action='store_true', dest='build', + help="Build dependencies under all circumstances. By default we will " + + "not build dependencies unless ART_TEST_RUN_TEST_BUILD=true.") + parser.set_defaults(build = env.ART_TEST_RUN_TEST_BUILD) parser.add_argument('--gdb', action='store_true', dest='gdb') parser.add_argument('--gdb-arg', dest='gdb_arg') @@ -804,8 +811,7 @@ def parse_option(): if options.dry_run: dry_run = True verbose = True - if options.build: - build = True + build = options.build if options.gdb: n_thread = 1 gdb = True |