Show More
@@ -595,6 +595,16 b' class Test(object):' | |||||
595 | if options.retest and not os.path.exists('%s.err' % self._test): |
|
595 | if options.retest and not os.path.exists('%s.err' % self._test): | |
596 | return self.ignore('not retesting') |
|
596 | return self.ignore('not retesting') | |
597 |
|
597 | |||
|
598 | if options.keywords: | |||
|
599 | f = open(self._test) | |||
|
600 | t = f.read().lower() + self._test.lower() | |||
|
601 | f.close() | |||
|
602 | for k in options.keywords.lower().split(): | |||
|
603 | if k in t: | |||
|
604 | break | |||
|
605 | else: | |||
|
606 | return self.ignore("doesn't match keyword") | |||
|
607 | ||||
598 | # Remove any previous output files. |
|
608 | # Remove any previous output files. | |
599 | if os.path.exists(self._errpath): |
|
609 | if os.path.exists(self._errpath): | |
600 | os.remove(self._errpath) |
|
610 | os.remove(self._errpath) | |
@@ -1125,17 +1135,6 b' def runone(options, test, count):' | |||||
1125 | err = os.path.join(TESTDIR, test + ".err") |
|
1135 | err = os.path.join(TESTDIR, test + ".err") | |
1126 | lctest = test.lower() |
|
1136 | lctest = test.lower() | |
1127 |
|
1137 | |||
1128 | if not (options.whitelisted and test in options.whitelisted): |
|
|||
1129 | if options.keywords: |
|
|||
1130 | fp = open(test) |
|
|||
1131 | t = fp.read().lower() + test.lower() |
|
|||
1132 | fp.close() |
|
|||
1133 | for k in options.keywords.lower().split(): |
|
|||
1134 | if k in t: |
|
|||
1135 | break |
|
|||
1136 | else: |
|
|||
1137 | return ignore("doesn't match keyword") |
|
|||
1138 |
|
||||
1139 | if not os.path.basename(lctest).startswith("test-"): |
|
1138 | if not os.path.basename(lctest).startswith("test-"): | |
1140 | return skip("not a test file") |
|
1139 | return skip("not a test file") | |
1141 | for ext, cls, out in testtypes: |
|
1140 | for ext, cls, out in testtypes: |
General Comments 0
You need to be logged in to leave comments.
Login now