Show More
@@ -633,7 +633,7 b' def run(cmd, options, replacements):' | |||
|
633 | 633 | output = re.sub(s, r, output) |
|
634 | 634 | return ret, splitnewlines(output) |
|
635 | 635 | |
|
636 | def runone(options, test, skips, fails): | |
|
636 | def runone(options, test, skips, fails, ignores): | |
|
637 | 637 | '''tristate output: |
|
638 | 638 | None -> skipped |
|
639 | 639 | True -> passed |
@@ -940,17 +940,18 b' def runtests(options, tests):' | |||
|
940 | 940 | |
|
941 | 941 | skips = [] |
|
942 | 942 | fails = [] |
|
943 | ignores = [] | |
|
943 | 944 | |
|
944 | 945 | for test in tests: |
|
945 | 946 | if options.blacklist: |
|
946 | 947 | filename = options.blacklist.get(test) |
|
947 | 948 | if filename is not None: |
|
948 |
skip |
|
|
949 | skipped.append((test, "blacklisted (%s)" % filename)) | |
|
949 | 950 | skipped += 1 |
|
950 | 951 | continue |
|
951 | 952 | |
|
952 | 953 | if options.retest and not os.path.exists(test + ".err"): |
|
953 | skipped += 1 | |
|
954 | ignores.append((test, "not retesting")) | |
|
954 | 955 | continue |
|
955 | 956 | |
|
956 | 957 | if options.keywords: |
@@ -964,10 +965,10 b' def runtests(options, tests):' | |||
|
964 | 965 | if k in t: |
|
965 | 966 | break |
|
966 | 967 | else: |
|
967 | skipped += 1 | |
|
968 | ignores.append((test, "doesn't match keyword")) | |
|
968 | 969 | continue |
|
969 | 970 | |
|
970 | ret = runone(options, test, skips, fails) | |
|
971 | ret = runone(options, test, skips, fails, ignores) | |
|
971 | 972 | if ret is None: |
|
972 | 973 | skipped += 1 |
|
973 | 974 | elif not ret: |
@@ -992,7 +993,7 b' def runtests(options, tests):' | |||
|
992 | 993 | print "Failed %s: %s" % s |
|
993 | 994 | _checkhglib("Tested") |
|
994 | 995 | print "# Ran %d tests, %d skipped, %d failed." % ( |
|
995 |
tested, |
|
|
996 | tested, len(skips) + len(ignores), failed) | |
|
996 | 997 | |
|
997 | 998 | if options.anycoverage: |
|
998 | 999 | outputcoverage(options) |
General Comments 0
You need to be logged in to leave comments.
Login now