Changeset b826e6b for src/tests/test.py

Timestamp:

Jul 19, 2017, 11:49:33 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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, resolv-new, with_gc

Children:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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

File:

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

src/tests/test.py

@@ -161 +161 @@
 
         # remove any outputs from the previous tests to prevent side effects
-        rm( (out_file, test.name), dry_run )
+        rm( (out_file, err_file, test.name), dry_run )
 
         options = "-debug" if debug else "-nodebug"
 
         # build, skipping to next test on error
-        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("""%s test=yes DEBUG_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
 
         retcode = 0
@@ -202 +202 @@
                         error = myfile.read()
 
-                
+
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
@@ -221 +221 @@
                 if   retcode == TestResult.SUCCESS:     result_txt = "Done"
                 elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
-                else :                                          result_txt = "ERROR"
+                else :                                          result_txt = "ERROR code %d" % retcode
         else :
                 if   retcode == TestResult.SUCCESS:     result_txt = "PASSED"
                 elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
-                else :                                          result_txt = "FAILED"
+                else :                                          result_txt = "FAILED with code %d" % retcode
 
         #print result with error if needed