Changeset a45fc7b for tests

Timestamp:

Mar 27, 2019, 2:44:34 PM (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:

1241851, ce3d305

Parents:

86fb8f2

Message:

Tests no longer use subprocess.run(shell=True), which solves leak process problems

Location:

tests

Files:

• pybin/settings.py (modified) (4 diffs)
• pybin/tools.py (modified) (9 diffs)
• test.py (modified) (4 diffs)

tests/pybin/settings.py

@@ -1 +1 @@
 import os
+import subprocess
 import sys
 from . import tools
@@ -82 +83 @@
         def __init__(self, value):
                 self.string = "debug" if value else "no debug"
-                self.flags  = """DEBUG_FLAGS="%s" """ % ("-debug -O0" if value else "-nodebug -O2")
+                self.flags  = """DEBUG_FLAGS=%s""" % ("-debug -O0" if value else "-nodebug -O2")
 
 class Install:
         def __init__(self, value):
                 self.string = "installed" if value else "in-tree"
-                self.flags  = """INSTALL_FLAGS="%s" """ % ("" if value else "-in-tree")
+                self.flags  = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree")
 
 class Timeouts:
@@ -114 +115 @@
         dry_run      = options.dry_run
         generating   = options.regenerate_expected
-        make         = 'make'
+        make         = ['make']
         debug        = Debug(options.debug)
         install      = Install(options.install)
@@ -125 +126 @@
         global make
 
-        make = "make" if not force else ("make -j%i" % jobs)
+        make = ['make'] if not force else ['make', "-j%i" % jobs]
 
 def validate():
         errf = os.path.join(BUILDDIR, ".validate.err")
-        make_ret, _ = tools.make( ".validate", error_file = errf, redirects  = "2> /dev/null 1> /dev/null", )
+        make_ret, out = tools.make( ".validate", error_file = errf, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
         if make_ret != 0:
                 with open (errf, "r") as myfile:

tests/pybin/tools.py

@@ -1 +1 @@
 import __main__
 import argparse
+import contextlib
 import fileinput
 import multiprocessing
@@ -21 +22 @@
 
 # helper functions to run terminal commands
-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
+def sh(*cmd, timeout = False, output = None, input = None, error = subprocess.STDOUT):
+        cmd = list(cmd)
 
         # if this is a dry_run, only print the commands that would be ran
         if settings.dry_run :
-                print("cmd: %s" % cmd)
+                print("cmd: %s" % ' '.join(cmd))
                 return 0, None
 
-        # otherwise create a pipe and run the desired command
-        else :
+        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
+
+                # add output redirection if needed
+                if output and output != subprocess.DEVNULL and output != subprocess.PIPE:
+                        output = open(output, 'w')
+                        onexit.push(output)
+
+                # run the desired command
                 try:
                         proc = subprocess.run(
                                 cmd,
-                                stdout=None if print2stdout else PIPE,
+                                stdin =input,
+                                stdout=output,
                                 stderr=STDOUT,
-                                shell=True,
                                 timeout=settings.timeout.single if timeout else None
                         )
@@ -57 +65 @@
                 return False
 
-        code, out = sh("file %s" % fname, print2stdout = False)
+        code, out = sh("file %s" % fname, output=subprocess.PIPE)
         if code != 0:
                 return False
@@ -75 +83 @@
         if isinstance(files, str ): files = [ files ]
         for file in files:
-                sh("rm -f %s > /dev/null 2>&1" % file )
+                sh( 'rm', '-f', file, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
 
 # Create 1 or more directory
@@ -83 +91 @@
                 p = os.path.normpath( file )
                 d = os.path.dirname ( p )
-                sh( "mkdir -p {}".format(d) )
+                sh( 'mkdir', '-p', d, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
 
 
@@ -93 +101 @@
 # diff two files
 def diff( lhs, rhs ):
-        # diff the output of the files
-        diff_cmd = ("diff --text "
-                        "--old-group-format='\t\tmissing lines :\n"
-                        "%%<' \\\n"
-                        "--new-group-format='\t\tnew lines :\n"
-                        "%%>' \\\n"
-                        "--unchanged-group-format='%%=' \\"
-                        "--changed-group-format='\t\texpected :\n"
-                        "%%<"
-                        "\t\tgot :\n"
-                        "%%>\n' \\\n"
-                        "--new-line-format='\t\t%%dn\t%%L' \\\n"
-                        "--old-line-format='\t\t%%dn\t%%L' \\\n"
-                        "--unchanged-line-format='' \\\n"
-                        "%s %s")
-
         # fetch return code and error from the diff command
-        return sh(diff_cmd % (lhs, rhs), False)
+        return sh(
+                '''diff''',
+                '''--text''',
+                '''--old-group-format=\t\tmissing lines :\n%<''',
+                '''--new-line-format=\t\t%dn\t%L''',
+                '''--new-group-format=\t\tnew lines : \n%>''',
+                '''--old-line-format=\t\t%dn\t%L''',
+                '''--unchanged-group-format=%=''',
+                '''--changed-group-format=\t\texpected :\n%<\t\tgot :\n%>''',
+                '''--unchanged-line-format=''',
+                lhs,
+                rhs,
+                output=subprocess.PIPE
+        )
 
 # call make
-def make(target, flags = '', redirects = '', error_file = None, silent = False):
-        test_param = """test="%s" """ % (error_file) if error_file else ''
-        cmd = ' '.join([
-                settings.make,
-                '-s' if silent else '',
+def make(target, *, flags = '', output = None, error = None, error_file = None, silent = False):
+        test_param = """test="%s" """ % (error_file) if error_file else None
+        cmd = [
+                *settings.make,
+                '-s' if silent else None,
                 test_param,
                 settings.arch.flags,
@@ -123 +128 @@
                 settings.install.flags,
                 flags,
-                target,
-                redirects
-        ])
-        return sh(cmd)
+                target
+        ]
+        cmd = [s for s in cmd if s]
+        return sh(*cmd, output=output, error=error)
 
 def which(program):
@@ -146 +151 @@
 # move a file
 def mv(source, dest):
-        ret, _ = sh("mv %s %s" % (source, dest))
+        ret, _ = sh("mv", source, dest)
         return ret
 
 # cat one file into the other
 def cat(source, dest):
-        ret, _ = sh("cat %s > %s" % (source, dest))
+        ret, _ = sh("cat", source, output=dest)
         return ret
 
@@ -253 +258 @@
                 return 1, "ERR No core dump"
 
-        return sh("gdb -n %s %s -batch -x %s" % (path, core, cmd), print2stdout=False)
+        return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output=subprocess.PIPE)
 
 class Timed:

tests/test.py

@@ -141 +141 @@
         # build, skipping to next test on error
         with Timed() as comp_dur:
-                make_ret, _ = make( test.target(),      redirects  = ("2> %s 1> /dev/null" % out_file), error_file = err_file )
+                make_ret, _ = make( test.target(), output=subprocess.DEVNULL, error=out_file, error_file = err_file )
 
         # if the make command succeds continue otherwise skip to diff
@@ -195 +195 @@
 
                 #print result with error if needed
-                text = name_txt + result_txt
+                text = '\t' + name_txt + result_txt
                 out = sys.stdout
                 if error :
@@ -212 +212 @@
 def run_tests(tests, jobs) :
         # clean the sandbox from previous commands
-        make('clean', redirects = '> /dev/null 2>&1')
+        make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
         # create the executor for our jobs and handle the signal properly
@@ -230 +230 @@
 
         # clean the workspace
-        make('clean', redirects = '> /dev/null 2>&1')
+        make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
         for failed in results: