Show More
@@ -592,6 +592,9 b' class Test(object):' | |||||
592 | result.skipped = True |
|
592 | result.skipped = True | |
593 | return self.skip('blacklisted') |
|
593 | return self.skip('blacklisted') | |
594 |
|
594 | |||
|
595 | if options.retest and not os.path.exists('%s.err' % self._test): | |||
|
596 | return self.ignore('not retesting') | |||
|
597 | ||||
595 | # Remove any previous output files. |
|
598 | # Remove any previous output files. | |
596 | if os.path.exists(self._errpath): |
|
599 | if os.path.exists(self._errpath): | |
597 | os.remove(self._errpath) |
|
600 | os.remove(self._errpath) | |
@@ -763,6 +766,9 b' class Test(object):' | |||||
763 |
|
766 | |||
764 | return 's', self._test, msg |
|
767 | return 's', self._test, msg | |
765 |
|
768 | |||
|
769 | def ignore(self, msg): | |||
|
770 | return 'i', self._test, msg | |||
|
771 | ||||
766 | class TestResult(object): |
|
772 | class TestResult(object): | |
767 | """Holds the result of a test execution.""" |
|
773 | """Holds the result of a test execution.""" | |
768 |
|
774 | |||
@@ -1115,17 +1121,11 b' def runone(options, test, count):' | |||||
1115 | log("\nSkipping %s: %s" % (testpath, msg)) |
|
1121 | log("\nSkipping %s: %s" % (testpath, msg)) | |
1116 | return 's', test, msg |
|
1122 | return 's', test, msg | |
1117 |
|
1123 | |||
1118 | def ignore(msg): |
|
|||
1119 | return 'i', test, msg |
|
|||
1120 |
|
||||
1121 | testpath = os.path.join(TESTDIR, test) |
|
1124 | testpath = os.path.join(TESTDIR, test) | |
1122 | err = os.path.join(TESTDIR, test + ".err") |
|
1125 | err = os.path.join(TESTDIR, test + ".err") | |
1123 | lctest = test.lower() |
|
1126 | lctest = test.lower() | |
1124 |
|
1127 | |||
1125 | if not (options.whitelisted and test in options.whitelisted): |
|
1128 | if not (options.whitelisted and test in options.whitelisted): | |
1126 | if options.retest and not os.path.exists(test + ".err"): |
|
|||
1127 | return ignore("not retesting") |
|
|||
1128 |
|
||||
1129 | if options.keywords: |
|
1129 | if options.keywords: | |
1130 | fp = open(test) |
|
1130 | fp = open(test) | |
1131 | t = fp.read().lower() + test.lower() |
|
1131 | t = fp.read().lower() + test.lower() |
General Comments 0
You need to be logged in to leave comments.
Login now