Show More
@@ -586,6 +586,12 b' class Test(object):' | |||||
586 | result.skipped = True |
|
586 | result.skipped = True | |
587 | return self.skip("Doesn't exist") |
|
587 | return self.skip("Doesn't exist") | |
588 |
|
588 | |||
|
589 | options = self._options | |||
|
590 | if not (options.whitelisted and self._test in options.whitelisted): | |||
|
591 | if options.blacklist and self._test in options.blacklist: | |||
|
592 | result.skipped = True | |||
|
593 | return self.skip('blacklisted') | |||
|
594 | ||||
589 | # Remove any previous output files. |
|
595 | # Remove any previous output files. | |
590 | if os.path.exists(self._errpath): |
|
596 | if os.path.exists(self._errpath): | |
591 | os.remove(self._errpath) |
|
597 | os.remove(self._errpath) | |
@@ -595,7 +601,7 b' class Test(object):' | |||||
595 | replacements, port = self._getreplacements(testtmp) |
|
601 | replacements, port = self._getreplacements(testtmp) | |
596 | env = self._getenv(testtmp, port) |
|
602 | env = self._getenv(testtmp, port) | |
597 | self._daemonpids.append(env['DAEMON_PIDS']) |
|
603 | self._daemonpids.append(env['DAEMON_PIDS']) | |
598 |
createhgrc(env['HGRCPATH'], |
|
604 | createhgrc(env['HGRCPATH'], options) | |
599 |
|
605 | |||
600 | starttime = time.time() |
|
606 | starttime = time.time() | |
601 |
|
607 | |||
@@ -620,7 +626,7 b' class Test(object):' | |||||
620 |
|
626 | |||
621 | result.refout = self._refout |
|
627 | result.refout = self._refout | |
622 |
|
628 | |||
623 |
if not |
|
629 | if not options.keep_tmpdir: | |
624 | shutil.rmtree(testtmp) |
|
630 | shutil.rmtree(testtmp) | |
625 |
|
631 | |||
626 | def describe(ret): |
|
632 | def describe(ret): | |
@@ -648,10 +654,10 b' class Test(object):' | |||||
648 | return self.fail('timed out', ret) |
|
654 | return self.fail('timed out', ret) | |
649 | elif out != self._refout: |
|
655 | elif out != self._refout: | |
650 | info = {} |
|
656 | info = {} | |
651 |
if not |
|
657 | if not options.nodiff: | |
652 | iolock.acquire() |
|
658 | iolock.acquire() | |
653 |
if |
|
659 | if options.view: | |
654 |
os.system("%s %s %s" % ( |
|
660 | os.system("%s %s %s" % (options.view, self._refpath, | |
655 | self._errpath)) |
|
661 | self._errpath)) | |
656 | else: |
|
662 | else: | |
657 | info = showdiff(self._refout, out, self._refpath, |
|
663 | info = showdiff(self._refout, out, self._refpath, | |
@@ -1117,9 +1123,6 b' def runone(options, test, count):' | |||||
1117 | lctest = test.lower() |
|
1123 | lctest = test.lower() | |
1118 |
|
1124 | |||
1119 | if not (options.whitelisted and test in options.whitelisted): |
|
1125 | if not (options.whitelisted and test in options.whitelisted): | |
1120 | if options.blacklist and test in options.blacklist: |
|
|||
1121 | return skip("blacklisted") |
|
|||
1122 |
|
||||
1123 | if options.retest and not os.path.exists(test + ".err"): |
|
1126 | if options.retest and not os.path.exists(test + ".err"): | |
1124 | return ignore("not retesting") |
|
1127 | return ignore("not retesting") | |
1125 |
|
1128 |
General Comments 0
You need to be logged in to leave comments.
Login now