Changeset 472ca32

Timestamp:

Jun 28, 2016, 2:42:16 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

66999e7

Parents:

2e04c7b3

Message:

test script now formats errors to be much more readable

File:

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

src/tests/test.py

@@ -21 +21 @@
         return list
 
-def sh(cmd, dry_run):
+def sh(cmd, dry_run = False, print2stdout = True):
         if dry_run :
                 print("cmd: %s" % cmd)
-                return 0
+                return 0, None
         else :
-                proc = Popen(cmd, stderr=STDOUT, shell=True)
-                proc.communicate()
-                return proc.returncode
+                proc = Popen(cmd, stdout=None if print2stdout else PIPE, stderr=STDOUT, shell=True)
+                out, err = proc.communicate()
+                return proc.returncode, out
 
 def file_replace(fname, pat, s_after):
@@ -61 +61 @@
 
         # build, skipping to next test on error
-        make_ret = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
+        make_ret, _ = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
 
         if make_ret == 0 :
@@ -71 +71 @@
 
         retcode = 0
+        error = None
 
         fix_MakeLevel(out_file)
@@ -76 +77 @@
         if not generate :
                 # diff the output of the files
-                retcode = sh("diff .expect/%s.txt .out/%s.log" % (test, test), dry_run)
+                diff_cmd = ("diff --old-group-format='\t\tmissing lines :\n"
+                                        "%%<' \\\n"
+                                        "--new-group-format='\t\tnew lines :\n"
+                                        "%%>' \\\n"
+                                        "--unchanged-group-format='%%=' \\"
+                                        "--changed-group-format='\t\texpected :\n"
+                                        "%%<\n"
+                                        "\t\tgot :\n"
+                                        "%%>' \\\n"
+                                        "--new-line-format='\t\t%%dn\t%%L' \\\n"
+                                        "--old-line-format='\t\t%%dn\t%%L' \\\n"
+                                        "--unchanged-line-format='' \\\n"
+                                        ".expect/%s.txt .out/%s.log")
+
+                retcode, error = sh(diff_cmd % (test, test), dry_run, False)
 
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test, dry_run)
 
-        return retcode
+        return retcode, error
 
 def run_tests(tests, generate, dry_run) :
@@ -94 +109 @@
                 print("%20s  " % t, end="")
                 sys.stdout.flush()
-                test_failed = run_test_instance(t, generate, dry_run)
+                test_failed, error = run_test_instance(t, generate, dry_run)
                 failed = test_failed or failed
 
                 if not generate :
                         print("FAILED" if test_failed else "PASSED")
+                        if error :
+                                print(error)
                 else :
                         print( "Done" )