##// END OF EJS Templates
run-tests: fix some missing i/o locks
Matt Mackall -
r14003:ba734ff5 default
parent child Browse files
Show More
@@ -667,16 +667,22 b' def runone(options, test):'
667 if not options.verbose:
667 if not options.verbose:
668 result('s', (test, msg))
668 result('s', (test, msg))
669 else:
669 else:
670 iolock.acquire()
670 print "\nSkipping %s: %s" % (testpath, msg)
671 print "\nSkipping %s: %s" % (testpath, msg)
672 iolock.release()
671 return None
673 return None
672
674
673 def fail(msg, ret):
675 def fail(msg, ret):
674 if not options.nodiff:
676 if not options.nodiff:
677 iolock.acquire()
675 print "\nERROR: %s %s" % (testpath, msg)
678 print "\nERROR: %s %s" % (testpath, msg)
679 iolock.release()
676 if (not ret and options.interactive
680 if (not ret and options.interactive
677 and os.path.exists(testpath + ".err")):
681 and os.path.exists(testpath + ".err")):
682 iolock.acquire()
678 print "Accept this change? [n] ",
683 print "Accept this change? [n] ",
679 answer = sys.stdin.readline().strip()
684 answer = sys.stdin.readline().strip()
685 iolock.release()
680 if answer.lower() in "y yes".split():
686 if answer.lower() in "y yes".split():
681 if test.endswith(".t"):
687 if test.endswith(".t"):
682 rename(testpath + ".err", testpath)
688 rename(testpath + ".err", testpath)
General Comments 0
You need to be logged in to leave comments. Login now