Changeset 96f01d7f

Timestamp:

Oct 1, 2021, 8:22:40 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

e16eb460

Parents:

7ce2483 (diff), 172a88d (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• pybin/test_run.py (modified) (1 diff)
• test.py (modified) (6 diffs)

tests/pybin/test_run.py

@@ -65 +65 @@
         def toString( cls, retcode, duration ):
                 if settings.generating :
-                        if   retcode == TestResult.SUCCESS:     text = "Done   "
-                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
-                        else :                                          text = "ERROR code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     key = 'pass'; text = "Done   "
+                        elif retcode == TestResult.TIMEOUT:     key = 'time'; text = "TIMEOUT"
+                        else :  key = 'fail';   text = "ERROR code %d" % retcode
                 else :
-                        if   retcode == TestResult.SUCCESS:     text = "PASSED "
-                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
-                        else :                                          text = "FAILED with code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     key = 'pass'; text = "PASSED "
+                        elif retcode == TestResult.TIMEOUT:     key = 'time'; text = "TIMEOUT"
+                        else :  key = 'fail';   text = "FAILED with code %d" % retcode
 
                 text += "    C%s - R%s" % (fmtDur(duration[0]), fmtDur(duration[1]))
-                return text
+                return key, text

tests/test.py

@@ -257 +257 @@
 
                 # update output based on current action
-                result_txt = TestResult.toString( retcode, duration )
+                result_key, result_txt = TestResult.toString( retcode, duration )
 
                 #print result with error if needed
@@ -265 +265 @@
                         text = text + '\n' + error
 
-                return retcode == TestResult.SUCCESS, text
+                return retcode == TestResult.SUCCESS, result_key, text
         except KeyboardInterrupt:
-                return False, ""
+                return False, 'keybrd', ""
         # except Exception as ex:
         #       print("Unexpected error in worker thread running {}: {}".format(t.target(), ex), file=sys.stderr)
@@ -283 +283 @@
 
         failed = False
+        rescnts = {     'pass': 0, 'fail': 0, 'time': 0, 'keybrd': 0 }
+        other = 0
 
         # for each test to run
@@ -294 +296 @@
                 )
 
-                for i, (succ, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
+                for i, (succ, code, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
+                        if code in rescnts.keys():
+                                rescnts[code] += 1
+                        else:
+                                other += 1
+
                         if not succ :
                                 failed = True
@@ -319 +326 @@
         # clean the workspace
         make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
+
+        print("{} passes, {} failures, {} timeouts, {} cancelled, {} other".format(rescnts['pass'], rescnts['fail'], rescnts['time'], rescnts['keybrd'], other))
 
         return failed
@@ -443 +452 @@
                         failed = run_tests(local_tests, options.jobs)
                         if failed:
-                                result = 1
                                 if not settings.continue_:
                                         break