Changeset a45fc7b for tests/pybin/settings.py

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

File:

• tests/pybin/settings.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: