Show More
@@ -754,18 +754,13 b' def runone(options, test):' | |||
|
754 | 754 | True -> passed |
|
755 | 755 | False -> failed''' |
|
756 | 756 | |
|
757 |
global results, |
|
|
757 | global results, iolock | |
|
758 | 758 | |
|
759 | 759 | testpath = os.path.join(TESTDIR, test) |
|
760 | 760 | |
|
761 | def result(l, e): | |
|
762 | resultslock.acquire() | |
|
763 | results[l].append(e) | |
|
764 | resultslock.release() | |
|
765 | ||
|
766 | 761 | def skip(msg): |
|
767 | 762 | if not options.verbose: |
|
768 |
result |
|
|
763 | results['s'].append((test, msg)) | |
|
769 | 764 | else: |
|
770 | 765 | iolock.acquire() |
|
771 | 766 | print "\nSkipping %s: %s" % (testpath, msg) |
@@ -788,15 +783,15 b' def runone(options, test):' | |||
|
788 | 783 | rename(testpath + ".err", testpath) |
|
789 | 784 | else: |
|
790 | 785 | rename(testpath + ".err", testpath + ".out") |
|
791 |
|
|
|
786 | success(test) | |
|
792 | 787 | return |
|
793 |
result |
|
|
788 | results['f'].append((test, msg)) | |
|
794 | 789 | |
|
795 | 790 | def success(): |
|
796 |
result |
|
|
791 | results['p'].append(test) | |
|
797 | 792 | |
|
798 | 793 | def ignore(msg): |
|
799 |
result |
|
|
794 | results['i'].append((test, msg)) | |
|
800 | 795 | |
|
801 | 796 | if (os.path.basename(test).startswith("test-") and '~' not in test and |
|
802 | 797 | ('.' not in test or test.endswith('.py') or |
@@ -1099,7 +1094,6 b' def runchildren(options, tests):' | |||
|
1099 | 1094 | sys.exit(failures != 0) |
|
1100 | 1095 | |
|
1101 | 1096 | results = dict(p=[], f=[], s=[], i=[]) |
|
1102 | resultslock = threading.Lock() | |
|
1103 | 1097 | iolock = threading.Lock() |
|
1104 | 1098 | |
|
1105 | 1099 | def runqueue(options, tests, results): |
General Comments 0
You need to be logged in to leave comments.
Login now