Changeset 84d4d6f for src

Timestamp:

Jun 30, 2016, 10:58:22 AM (8 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:

ca35c51, f80e0218

Parents:

177a5ce

Message:

python script can now regenerate expected for any tests that has a make target

File:

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

src/tests/test.py

@@ -49 +49 @@
                 file_replace(file, "make\[%i\]" % int(environ.get('MAKELEVEL')), 'make' )
 
+def fileContainsOnly(file, text) :
+        with open(file) as f:
+                ff = f.read().strip()
+                result = ff == text.strip()
+                #
+                # print("Comparing :\n\t'%s'\nWith:\n\t'%s'" % (ff, text))
+                # print("Result is : \n\t", end="")
+                # print(result)
+
+                return result;
+
 
 ################################################################################
@@ -75 +86 @@
         fix_MakeLevel(out_file)
 
-        if not generate :
+        if generate :
+                if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test) :
+                        retcode = 1;
+                        error = "\t\tNo make target for test %s!" % test
+                        sh("rm %s" % out_file, False)
+
+        else :
                 # diff the output of the files
                 diff_cmd = ("diff --old-group-format='\t\tmissing lines :\n"
@@ -112 +129 @@
                 failed = test_failed or failed
 
-                if not generate :
-                        print("FAILED" if test_failed else "PASSED")
-                        if error :
-                                print(error)
+                if generate :
+                        failed_txt = "ERROR"
+                        success_txt = "Done"
                 else :
-                        print( "Done" )
+                        failed_txt = "FAILED"
+                        success_txt = "PASSED"
+
+                print(failed_txt if test_failed else success_txt)
+                if error :
+                        print(error, file=sys.stderr)
 
         sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)