##// END OF EJS Templates
run-tests: exit cleanly if parallel run is interrupted...
Bryan O'Sullivan -
r18383:6880eae9 default
parent child Browse files
Show More
@@ -1125,8 +1125,8 b' def runchildren(options, tests):'
1125 pid, status, fp = waitq.get()
1125 pid, status, fp = waitq.get()
1126 try:
1126 try:
1127 childresults = pickle.load(fp)
1127 childresults = pickle.load(fp)
1128 except pickle.UnpicklingError:
1128 except (pickle.UnpicklingError, EOFError):
1129 pass
1129 sys.exit(255)
1130 else:
1130 else:
1131 passed += len(childresults['p'])
1131 passed += len(childresults['p'])
1132 skipped += len(childresults['s'])
1132 skipped += len(childresults['s'])
@@ -1221,7 +1221,8 b' def runtests(options, tests):'
1221 outputcoverage(options)
1221 outputcoverage(options)
1222 except KeyboardInterrupt:
1222 except KeyboardInterrupt:
1223 failed = True
1223 failed = True
1224 print "\ninterrupted!"
1224 if not options.child:
1225 print "\ninterrupted!"
1225
1226
1226 if failed:
1227 if failed:
1227 sys.exit(1)
1228 sys.exit(1)
General Comments 0
You need to be logged in to leave comments. Login now