run-tests: always gather runtimes stable
authorMatt Mackall <mpm@selenic.com>
Fri, 07 Jun 2013 15:56:16 -0500
branchstable
changeset 1268 6133577ca4f6
parent 1267 663143c0a5e2
child 1269 a11176ad8001
run-tests: always gather runtimes [ original upstream message ]
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'])