Show More
@@ -671,6 +671,16 b' def runone(options, test, skips, passes,' | |||||
671 | else: |
|
671 | else: | |
672 | return None # not a supported test, don't record |
|
672 | return None # not a supported test, don't record | |
673 |
|
673 | |||
|
674 | if options.blacklist: | |||
|
675 | filename = options.blacklist.get(test) | |||
|
676 | if filename is not None: | |||
|
677 | skipped.append((test, "blacklisted (%s)" % filename)) | |||
|
678 | return None | |||
|
679 | ||||
|
680 | if options.retest and not os.path.exists(test + ".err"): | |||
|
681 | ignores.append((test, "not retesting")) | |||
|
682 | return None | |||
|
683 | ||||
674 | if options.keywords: |
|
684 | if options.keywords: | |
675 | fp = open(test) |
|
685 | fp = open(test) | |
676 | t = fp.read().lower() + test.lower() |
|
686 | t = fp.read().lower() + test.lower() | |
@@ -953,16 +963,6 b' def runtests(options, tests):' | |||||
953 | ignores = [] |
|
963 | ignores = [] | |
954 |
|
964 | |||
955 | for test in tests: |
|
965 | for test in tests: | |
956 | if options.blacklist: |
|
|||
957 | filename = options.blacklist.get(test) |
|
|||
958 | if filename is not None: |
|
|||
959 | skipped.append((test, "blacklisted (%s)" % filename)) |
|
|||
960 | continue |
|
|||
961 |
|
||||
962 | if options.retest and not os.path.exists(test + ".err"): |
|
|||
963 | ignores.append((test, "not retesting")) |
|
|||
964 | continue |
|
|||
965 |
|
||||
966 | ret = runone(options, test, skips, passes, fails, ignores) |
|
966 | ret = runone(options, test, skips, passes, fails, ignores) | |
967 | if options.first and ret is not None and not ret: |
|
967 | if options.first and ret is not None and not ret: | |
968 | break |
|
968 | break |
General Comments 0
You need to be logged in to leave comments.
Login now