Changeset 4a333d35 for src

Timestamp:

May 18, 2018, 3:36:36 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

cac8a6e

Parents:

cb6314e (diff), c7d8100c (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:

src

Files:

• Common/SemanticError.cc (modified) (3 diffs)
• Common/SemanticError.h (modified) (2 diffs)
• tests/pybin/test_run.py (modified) (2 diffs)
• tests/test.py (modified) (5 diffs)

src/Common/SemanticError.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 18:13:37 2018
-// Update Count     : 8
+// Last Modified On : Wed May 16 15:01:20 2018
+// Update Count     : 9
 //
 
@@ -70 +70 @@
 //-----------------------------------------------------------------------------
 // Semantic Error
+bool SemanticErrorThrow = false;
+
 SemanticErrorException::SemanticErrorException( CodeLocation location, std::string error ) {
         append( location, error );
@@ -94 +96 @@
 
 void SemanticError( CodeLocation location, std::string error ) {
+        SemanticErrorThrow = true;
         throw SemanticErrorException(location, error);
 }

src/Common/SemanticError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 18:13:15 2018
-// Update Count     : 29
+// Last Modified On : Wed May 16 15:01:23 2018
+// Update Count     : 30
 //
 
@@ -21 +21 @@
 //-----------------------------------------------------------------------------
 // Errors
+
+extern bool SemanticErrorThrow;
 
 __attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );

src/tests/pybin/test_run.py

@@ -4 +4 @@
 
 import pybin.settings
+import datetime
+
+from string import Template
+
+class DeltaTemplate(Template):
+    delimiter = "%"
+
+def strfdelta(tdelta, fmt):
+    d["H"], rem = divmod(tdelta.seconds, 3600)
+    d["M"], d["S"] = divmod(rem, 60)
+    t = DeltaTemplate(fmt)
+    return t.substitute(**d)
 
 # Test class that defines what a test is
@@ -57 +69 @@
 
         @classmethod
-        def toString( cls, retcode ):
+        def toString( cls, retcode, duration ):
                 if settings.generating :
-                        if   retcode == TestResult.SUCCESS:     return "Done"
-                        elif retcode == TestResult.TIMEOUT:     return "TIMEOUT"
-                        else :                                          return "ERROR code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     text = "Done   "
+                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
+                        else :                                          text = "ERROR code %d" % retcode
                 else :
-                        if   retcode == TestResult.SUCCESS:     return "PASSED"
-                        elif retcode == TestResult.TIMEOUT:     return "TIMEOUT"
-                        else :                                          return "FAILED with code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     text = "PASSED "
+                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
+                        else :                                          text = "FAILED with code %d" % retcode
+
+                text += "    C%s - R%s" % (cls.fmtDur(duration[0]), cls.fmtDur(duration[1]))
+                return text
+
+        @classmethod
+        def fmtDur( cls, duration ):
+                if duration :
+                        hours, rem = divmod(duration, 3600)
+                        minutes, rem = divmod(rem, 60)
+                        seconds, millis = divmod(rem, 1)
+                        return "%2d:%02d.%03d" % (minutes, seconds, millis * 1000)
+                return " n/a"

src/tests/test.py

@@ -9 +9 @@
 import re
 import sys
+import time
 
 ################################################################################
@@ -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