Changeset bee653c for tests/pybin

Timestamp:

Mar 28, 2019, 6:35:21 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2fabdc02, 9be2b60

Parents:

8a25be9 (diff), b611fc3 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/pybin/tools.py (modified) (6 diffs)

tests/pybin/tools.py

@@ -11 +11 @@
 import subprocess
 import sys
+import tempfile
 import time
 import types
 
 from pybin import settings
-from subprocess import Popen, PIPE, STDOUT
 
 ################################################################################
@@ -27 +27 @@
         # if this is a dry_run, only print the commands that would be ran
         if settings.dry_run :
-                print("cmd: %s" % ' '.join(cmd))
+                cmd = "{} cmd: {}".format(os.getcwd(), ' '.join(cmd))
+                if output and not isinstance(output, int):
+                        cmd += " > "
+                        cmd += output
+
+                if error and not isinstance(error, int):
+                        cmd += " 2> "
+                        cmd += error
+
+                if input and not isinstance(input, int) and os.path.isfile(input):
+                        cmd += " < "
+                        cmd += input
+
+                print(cmd)
                 return 0, None
 
         with contextlib.ExitStack() as onexit:
                 # add input redirection if needed
-                if input and input != subprocess.DEVNULL:
-                        if os.path.isfile(input):
-                                input = open(input)
-                                onexit.push(input)
-                        else:
-                                input = None
+                input = openfd(input, 'r', onexit, True)
 
                 # add output redirection if needed
-                if output and output != subprocess.DEVNULL and output != subprocess.PIPE:
-                        output = open(output, 'w')
-                        onexit.push(output)
+                output = openfd(output, 'w', onexit, False)
+
+                # add error redirection if needed
+                error = openfd(error, 'w', onexit, False)
 
                 # run the desired command
@@ -50 +59 @@
                                 stdin =input,
                                 stdout=output,
-                                stderr=STDOUT,
+                                stderr=error,
                                 timeout=settings.timeout.single if timeout else None
                         )
@@ -78 +87 @@
 def is_exe(fname):
         return os.path.isfile(fname) and os.access(fname, os.X_OK)
+
+def openfd(file, mode, exitstack, checkfile):
+        if not file:
+                return file
+
+        if isinstance(file, int):
+                return file
+
+        if checkfile and not os.path.isfile(file):
+                return None
+
+        file = open(file, mode)
+        exitstack.push(file)
+        return file
 
 # Remove 1 or more files silently
@@ -146 +169 @@
     return None
 
+@contextlib.contextmanager
+def tempdir():
+        cwd = os.getcwd()
+        with tempfile.TemporaryDirectory() as temp:
+                os.chdir(temp)
+                try:
+                        yield temp
+                finally:
+                        os.chdir(cwd)
+
 ################################################################################
 #               file handling
@@ -246 +279 @@
 
 def core_info(path):
+        if not os.path.isfile(path):
+                return 1, "ERR Executable path is wrong"
+
         cmd   = os.path.join(settings.SRCDIR, "pybin/print-core.gdb")
         if not os.path.isfile(cmd):
                 return 1, "ERR Printing format for core dumps not found"
 
-        dname = os.path.dirname(path)
-        core  = os.path.join(dname, "core" )
-        if not os.path.isfile(path):
-                return 1, "ERR Executable path is wrong"
+        core  = os.path.join(os.getcwd(), "core" )
 
         if not os.path.isfile(core):