# HG changeset patch # User Matt Mackall # Date 1163013608 21600 # Node ID cc0cd5942223d52a12a5d7cbb067f994e8cae6bf # Parent a90a86929d046cc23f7b175456ad7e29f030f109 tests: add -R switch Restarts at first .err file if one exists, otherwise runs all tests diff -r a90a86929d04 -r cc0cd5942223 tests/run-tests.py --- a/tests/run-tests.py Wed Nov 08 13:20:08 2006 -0600 +++ b/tests/run-tests.py Wed Nov 08 13:20:08 2006 -0600 @@ -36,6 +36,8 @@ help="retest failed tests") parser.add_option("-f", "--first", action="store_true", help="exit on the first test failure") +parser.add_option("-R", "--restart", action="store_true", + help="restart at last error") parser.set_defaults(timeout=180) (options, args) = parser.parse_args() @@ -355,7 +357,7 @@ print 'WARNING: cannot run tests with timeouts' options.timeout = 0 - tests = 0 + tested = 0 failed = 0 skipped = 0 @@ -363,23 +365,38 @@ args = os.listdir(".") args.sort() + + tests = [] for test in args: if (test.startswith("test-") and '~' not in test and ('.' not in test or test.endswith('.py') or test.endswith('.bat'))): - if options.retest and not os.path.exists(test + ".err"): - skipped += 1 - continue - ret = run_one(test) - if ret is None: - skipped += 1 - elif not ret: - failed += 1 - if options.first: - break - tests += 1 + tests.append(test) + + if options.restart: + orig = list(tests) + while tests: + if os.path.exists(tests[0] + ".err"): + break + tests.pop(0) + if not tests: + print "running all tests" + tests = orig - print "\n# Ran %d tests, %d skipped, %d failed." % (tests, skipped, + for test in tests: + if options.retest and not os.path.exists(test + ".err"): + skipped += 1 + continue + ret = run_one(test) + if ret is None: + skipped += 1 + elif not ret: + failed += 1 + if options.first: + break + tested += 1 + + print "\n# Ran %d tests, %d skipped, %d failed." % (tested, skipped, failed) if coverage: output_coverage()