Changeset 2b10f95 for tests/pybin

Timestamp:

Mar 27, 2019, 11:09:15 AM (5 years ago)

Author:

tdelisle <tdelisle@…>

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:

86fb8f2

Parents:

1bb2488

Message:

Improved printing, added support for cpp tests and fix byte string concatenation error

File:

• tests/pybin/tools.py (modified) (1 diff)

tests/pybin/tools.py

@@ -37 +37 @@
         # otherwise create a pipe and run the desired command
         else :
-                proc = subprocess.run(
-                        cmd,
-                        stdout=None if print2stdout else PIPE,
-                        stderr=STDOUT,
-                        shell=True,
-                        timeout=settings.timeout.single if timeout else None
-                )
-                return proc.returncode, proc.stdout
+                try:
+                        proc = subprocess.run(
+                                cmd,
+                                stdout=None if print2stdout else PIPE,
+                                stderr=STDOUT,
+                                shell=True,
+                                timeout=settings.timeout.single if timeout else None
+                        )
+                        return proc.returncode, proc.stdout.decode("utf-8") if proc.stdout else None
+                except subprocess.TimeoutExpired:
+                        return 124, str(None)
 
 def is_ascii(fname):