Show More
@@ -320,6 +320,16 b' def vlog(*msg):' | |||
|
320 | 320 | sys.stdout.flush() |
|
321 | 321 | iolock.release() |
|
322 | 322 | |
|
323 | def log(*msg): | |
|
324 | iolock.acquire() | |
|
325 | if verbose: | |
|
326 | print verbose, | |
|
327 | for m in msg: | |
|
328 | print m, | |
|
329 | ||
|
330 | sys.stdout.flush() | |
|
331 | iolock.release() | |
|
332 | ||
|
323 | 333 | def findprogram(program): |
|
324 | 334 | """Search PATH for a executable program""" |
|
325 | 335 | for p in os.environ.get('PATH', os.defpath).split(os.pathsep): |
@@ -572,9 +582,7 b' def globmatch(el, l):' | |||
|
572 | 582 | if el + '\n' == l: |
|
573 | 583 | if os.name == 'nt': |
|
574 | 584 | # matching on "/" is not needed for this line |
|
575 | iolock.acquire() | |
|
576 | print "\nInfo, unnecessary glob: %s (glob)" % el | |
|
577 | iolock.release() | |
|
585 | log("\nInfo, unnecessary glob: %s (glob)" % el) | |
|
578 | 586 | return True |
|
579 | 587 | i, n = 0, len(el) |
|
580 | 588 | res = '' |
@@ -832,16 +840,12 b' def runone(options, test):' | |||
|
832 | 840 | |
|
833 | 841 | def skip(msg): |
|
834 | 842 | if options.verbose: |
|
835 | iolock.acquire() | |
|
836 | print "\nSkipping %s: %s" % (testpath, msg) | |
|
837 | iolock.release() | |
|
843 | log("\nSkipping %s: %s" % (testpath, msg)) | |
|
838 | 844 | return 's', test, msg |
|
839 | 845 | |
|
840 | 846 | def fail(msg, ret): |
|
841 | 847 | if not options.nodiff: |
|
842 | iolock.acquire() | |
|
843 | print "\nERROR: %s %s" % (testpath, msg) | |
|
844 | iolock.release() | |
|
848 | log("\nERROR: %s %s" % (testpath, msg)) | |
|
845 | 849 | if (not ret and options.interactive |
|
846 | 850 | and os.path.exists(testpath + ".err")): |
|
847 | 851 | iolock.acquire() |
General Comments 0
You need to be logged in to leave comments.
Login now