tests/run-tests.py
changeset 5078 d27ed83289ee
parent 4881 c51c9bc4579d
child 5081 ea7b982b6c08
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