equal
deleted
inserted
replaced
861 ret = 'timeout' |
861 ret = 'timeout' |
862 |
862 |
863 if ret: |
863 if ret: |
864 killdaemons(env['DAEMON_PIDS']) |
864 killdaemons(env['DAEMON_PIDS']) |
865 |
865 |
|
866 if abort: |
|
867 raise KeyboardInterrupt() |
|
868 |
866 for s, r in replacements: |
869 for s, r in replacements: |
867 output = re.sub(s, r, output) |
870 output = re.sub(s, r, output) |
868 return ret, output.splitlines(True) |
871 return ret, output.splitlines(True) |
869 |
872 |
870 def runone(options, test): |
873 def runone(options, test): |
1180 |
1183 |
1181 results = {'.':[], '!':[], 's':[], 'i':[]} |
1184 results = {'.':[], '!':[], 's':[], 'i':[]} |
1182 resultslock = threading.Lock() |
1185 resultslock = threading.Lock() |
1183 times = [] |
1186 times = [] |
1184 iolock = threading.Lock() |
1187 iolock = threading.Lock() |
|
1188 abort = False |
1185 |
1189 |
1186 def runqueue(options, tests): |
1190 def runqueue(options, tests): |
1187 for test in tests: |
1191 for test in tests: |
1188 code, test, msg = runone(options, test) |
1192 code, test, msg = runone(options, test) |
1189 resultslock.acquire() |
1193 resultslock.acquire() |