comparison tests/run-tests.py @ 5078:d27ed83289ee

Add message to test output if a test is aborted due to a timeout. Without this an aborted test could produce an empty .err file so the diff looks like as if all lines of the .out files are just missing for some unknown reason.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 06 Aug 2007 14:45:43 +0200
parents c51c9bc4579d
children ea7b982b6c08
comparison
equal deleted inserted replaced
5077:84b10dc3dccc 5078:d27ed83289ee
225 vlog('# Process %d timed out - killing it' % proc.pid) 225 vlog('# Process %d timed out - killing it' % proc.pid)
226 os.kill(proc.pid, signal.SIGTERM) 226 os.kill(proc.pid, signal.SIGTERM)
227 ret = proc.wait() 227 ret = proc.wait()
228 if ret == 0: 228 if ret == 0:
229 ret = signal.SIGTERM << 8 229 ret = signal.SIGTERM << 8
230 output += ("\n### Abort: timeout after %d seconds.\n"
231 % options.timeout)
230 return ret, splitnewlines(output) 232 return ret, splitnewlines(output)
231 233
232 def run_one(test): 234 def run_one(test):
233 '''tristate output: 235 '''tristate output:
234 None -> skipped 236 None -> skipped