Changeset 5e44ac2 for tests/pybin/tools.py

Timestamp:

Aug 15, 2018, 1:58:02 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

90cac45

Parents:

d7d63e5 (diff), 7bd4cc9 (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' into demangler

File:

• tests/pybin/tools.py (moved) (moved from src/tests/pybin/tools.py ) (5 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
@@ -52 +56 @@
 # Remove 1 or more files silently
 def rm( files ):
-        try:
+        if isinstance( files, basestring ):
+                sh("rm -f %s > /dev/null 2>&1" % files )
+        else:
                 for file in files:
                         sh("rm -f %s > /dev/null 2>&1" % file )
-        except TypeError:
-                sh("rm -f %s > /dev/null 2>&1" % files )
 
 # Create 1 or more directory
 def mkdir( files ):
-        try:
+        if isinstance( files, basestring ):
+                sh("mkdir -p %s" % os.path.dirname(files) )
+        else:
                 for file in files:
                         sh("mkdir -p %s" % os.path.dirname(file) )
-        except TypeError:
-                sh("mkdir -p %s" % os.path.dirname(files) )
+
 
 def chdir( dest = __main__.__file__ ):
@@ -74 +79 @@
 def diff( lhs, rhs ):
         # diff the output of the files
-        diff_cmd = ("diff --ignore-all-space "
+        diff_cmd = ("diff --ignore-all-space --text "
                                 "--ignore-blank-lines "
                                 "--old-group-format='\t\tmissing lines :\n"
@@ -100 +105 @@
                 '-s' if silent else '',
                 test_param,
+                settings.arch.flags,
                 settings.debug.flags,
+                settings.install.flags,
                 flags,
                 target,
@@ -129 +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: