Changeset 1bb2488 for tests/pybin/tools.py

Timestamp:

Mar 26, 2019, 11:15:49 AM (6 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:

2b10f95, ae6b6cf

Parents:

5bf1f3e

Message:

No longer need to use popen and signal handling in test.py

File:

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

tests/pybin/tools.py

@@ -8 +8 @@
 import signal
 import stat
+import subprocess
 import sys
 import time
@@ -20 +21 @@
 
 # helper functions to run terminal commands
-def sh(cmd, print2stdout = True, input = None):
+def sh(cmd, print2stdout = True, timeout = False, output = None, input = None):
         # add input redirection if needed
         if input and os.path.isfile(input):
                 cmd += " < %s" % input
+
+        # add output redirection if needed
+        if output:
+                cmd += " > %s" % output
 
         # if this is a dry_run, only print the commands that would be ran
@@ -32 +37 @@
         # otherwise create a pipe and run the desired command
         else :
-                proc = Popen(cmd, stdout=None if print2stdout else PIPE, stderr=STDOUT, shell=True)
-                out, err = proc.communicate()
-                return proc.returncode, out
+                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
 
 def is_ascii(fname):
@@ -128 +138 @@
     return None
 
-def run(exe, output, input):
-        ret, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe, output), input = input)
-        return ret
-
 ################################################################################
 #               file handling
@@ -208 +214 @@
         return min( options.jobs, len(tests) ), force
 
-# setup a proper processor pool with correct signal handling
-def setup_pool(jobs):
-        original_sigint_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
-        pool = multiprocessing.Pool(jobs)
-        signal.signal(signal.SIGINT, original_sigint_handler)
-
-        return pool
-
-# handle signals in scope
-class SignalHandling():
-        def __enter__(self):
-                # enable signal handling
-                signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-        def __exit__(self, type, value, traceback):
-                # disable signal handling
-                signal.signal(signal.SIGINT, signal.SIG_IGN)
-
-
 # enable core dumps for all the test children
 resource.setrlimit(resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
@@ -245 +232 @@
         column = which('column')
         if column:
-                cmd = "%s 2> /dev/null" % column
-                proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
-                proc.communicate(input=bytes(text + "\n", "UTF-8"))
+                subprocess.run(column, input=bytes(text + "\n", "UTF-8"))
         else:
                 print(text)