Changeset 455a7d5 for tests/pybin/tools.py

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 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:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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 jenkins-sandbox

File:

• tests/pybin/tools.py (moved) (moved from src/tests/pybin/tools.py ) (2 diffs)

tests/pybin/tools.py

@@ -52 +52 @@
 # 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__ ):
@@ -100 +101 @@
                 '-s' if silent else '',
                 test_param,
+                settings.arch.flags,
                 settings.debug.flags,
+                settings.install.flags,
                 flags,
                 target,