diff options
Diffstat (limited to 'test/testrunner/testrunner.py')
| -rwxr-xr-x | test/testrunner/testrunner.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 8c0b9283b6..9c8d3b870c 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -527,10 +527,10 @@ def print_test_info(test_name, result, failed_test_info=""): test_name = ('%s...%s') % ( test_name[:(allowed_test_length - 3)/2], test_name[-(allowed_test_length - 3)/2:]) - info += ('%s %s %s') % ( - progress_info, - test_name, - result_text) + info += ('%s %s %s') % ( + progress_info, + test_name, + result_text) print_text(info) except Exception, e: print_text(('%s\n%s\n') % (test_name, str(e))) @@ -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 |