Changeset 202ad72

Timestamp:

Aug 15, 2018, 11:18:53 AM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

8e485801

Parents:

7caea53

Message:

Implemented dry-run for output fixing and fix outputs on regenerate as well

Location:

tests

Files:

• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -36 +36 @@
 
 def is_ascii(fname):
+        if settings.dry_run:
+                print("is_ascii: %s" % fname)
+                return True
+
         if not os.path.isfile(fname):
                 return False
@@ -132 +136 @@
 # helper function to replace patterns in a file
 def file_replace(fname, pat, s_after):
+        if settings.dry_run:
+                print("replacing '%s' with '%s' in %s" % (pat, s_after, fname))
+                return
+
         file = fileinput.FileInput(fname, inplace=True, backup='.bak')
         for line in file:

tests/test.py

@@ -172 +172 @@
 
         if retcode == 0:
+                fixoutput(out_file)
                 if settings.generating :
                         # if we are ounly generating the output we still need to check that the test actually exists
@@ -182 +183 @@
                 else :
                         # fetch return code and error from the diff command
-                        fixoutput(out_file)
                         retcode, error = diff(cmp_file, out_file)