# HG changeset patch # User Matt Mackall # Date 1370638576 18000 # Node ID 6133577ca4f6a473227e3eb13fe1e8dc82b54a11 # Parent 663143c0a5e21bb2c1f36783f3505a045dd90794 run-tests: always gather runtimes [ original upstream message ] diff -r 663143c0a5e2 -r 6133577ca4f6 tests/run-tests.py --- a/tests/run-tests.py Wed Jun 05 22:05:29 2013 +0200 +++ b/tests/run-tests.py Fri Jun 07 15:56:16 2013 -0500 @@ -960,20 +960,16 @@ env = createenv(options, testtmp, threadtmp, port) createhgrc(env['HGRCPATH'], options) - if options.time: - starttime = time.time() + starttime = time.time() try: ret, out = runner(testpath, testtmp, options, replacements, env) except KeyboardInterrupt: - msg = '' - if options.time: - endtime = time.time() - msg = '(after %d seconds)' % (endtime - starttime) + endtime = time.time() + msg = '(after %d seconds)' % (endtime - starttime) log('INTERRUPTED:', test, msg) raise - if options.time: - endtime = time.time() - times.append((test, endtime - starttime)) + endtime = time.time() + times.append((test, endtime - starttime)) vlog("# Ret was:", ret) killdaemons(env['DAEMON_PIDS'])