equal
deleted
inserted
replaced
1123 if not job: |
1123 if not job: |
1124 continue |
1124 continue |
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']) |
1133 failed += len(childresults['f']) |
1133 failed += len(childresults['f']) |
1134 skips.extend(childresults['s']) |
1134 skips.extend(childresults['s']) |
1219 |
1219 |
1220 if options.anycoverage: |
1220 if options.anycoverage: |
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) |
1228 |
1229 |
1229 def main(): |
1230 def main(): |
1249 os.environ['GREP_OPTIONS'] = '' |
1250 os.environ['GREP_OPTIONS'] = '' |
1250 os.environ['http_proxy'] = '' |
1251 os.environ['http_proxy'] = '' |
1251 os.environ['no_proxy'] = '' |
1252 os.environ['no_proxy'] = '' |
1252 os.environ['NO_PROXY'] = '' |
1253 os.environ['NO_PROXY'] = '' |
1253 os.environ['TERM'] = 'xterm' |
1254 os.environ['TERM'] = 'xterm' |
|
1255 os.environ['PYTHONHASHSEED'] = 'random' |
1254 |
1256 |
1255 # unset env related to hooks |
1257 # unset env related to hooks |
1256 for k in os.environ.keys(): |
1258 for k in os.environ.keys(): |
1257 if k.startswith('HG_'): |
1259 if k.startswith('HG_'): |
1258 # can't remove on solaris |
1260 # can't remove on solaris |