Changeset 21bdce2 for src/tests/test.py

Timestamp:

May 21, 2018, 10:52:15 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

2f0a0678

Parents:

b12c036 (diff), 1596726 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/tests/test.py (modified) (6 diffs)

src/tests/test.py

@@ -9 +9 @@
 import re
 import sys
+import time
 
 ################################################################################
@@ -95 +96 @@
         parser.add_argument('--all', help='Run all test available', action='store_true')
         parser.add_argument('--regenerate-expected', help='Regenerate the .expect by running the specified tets, can be used with --all option', action='store_true')
-        parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int, default='8')
+        parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int)
         parser.add_argument('--list-comp', help='List all valide arguments', action='store_true')
         parser.add_argument('-I','--include', help='Directory of test to include, can be used multiple time, All  if omitted', action='append')
@@ -136 +137 @@
 
         # build, skipping to next test on error
+        before = time.time()
         make_ret, _ = make( test.target(),
                 redirects  = "2> %s 1> /dev/null" % out_file,
                 error_file = err_file
         )
+        after = time.time()
+
+        comp_dur = after - before
+
+        run_dur = None
 
         # if the make command succeds continue otherwise skip to diff
         if make_ret == 0 or settings.dry_run:
+                before = time.time()
                 if settings.dry_run or fileIsExecutable(test.target()) :
                         # run test
@@ -149 +157 @@
                         # simply cat the result into the output
                         retcode, _ = sh("cat %s > %s" % (test.target(), out_file))
+
+                after = time.time()
+                run_dur = after - before
         else:
                 retcode, _ = sh("mv %s %s" % (err_file, out_file))
@@ -174 +185 @@
         sh("rm -f %s > /dev/null 2>&1" % test.target())
 
-        return retcode, error
+        return retcode, error, [comp_dur, run_dur]
 
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
@@ -183 +194 @@
                 name_txt = "%20s  " % t.name
 
-                retcode, error = run_single_test(t)
+                retcode, error, duration = run_single_test(t)
 
                 # update output based on current action
-                result_txt = TestResult.toString( retcode )
+                result_txt = TestResult.toString( retcode, duration )
 
                 #print result with error if needed