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