Changeset 933f32f for tests/pybin/settings.py

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <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:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

• tests/pybin/settings.py (modified) (7 diffs)

tests/pybin/settings.py

@@ -1 @@
-from __future__ import print_function
-
 import os
+import subprocess
 import sys
-import tools
+from . import tools
 
 try :
@@ -39 +38 @@
         def __init__(self, arch):
                 try:
-                        canonical_host = Architecture.makeCanonical( config.HOSTARCH )
+                        canonical_host = Architecture.make_canonical( config.HOSTARCH )
                 except KeyError:
                         print("Unkown host architecture %s" % config.HOSTARCH, file=sys.stderr)
@@ -46 +45 @@
                 if arch:
                         try:
-                                arch = Architecture.makeCanonical( arch )
+                                arch = Architecture.make_canonical( arch )
                         except KeyError:
                                 print("Unkown architecture %s" % arch, file=sys.stderr)
@@ -77 +76 @@
 
         @classmethod
-        def makeCanonical(_, arch):
+        def make_canonical(_, arch):
                 return Architecture.KnownArchitectures[arch]
 
@@ -84 +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:
@@ -112 +111 @@
         global install
         global timeout
+        global output_width
 
-        dry_run    = options.dry_run
-        generating = options.regenerate_expected
-        make       = 'make'
-        debug        = Debug(options.debug)
-        install    = Install(options.install)
-        arch       = Architecture(options.arch)
-        timeout    = Timeouts(options.timeout, options.global_timeout)
+        dry_run      = options.dry_run
+        generating   = options.regenerate_expected
+        make         = ['make']
+        debug        = Debug(options.debug)
+        install      = Install(options.install)
+        arch         = Architecture(options.arch)
+        timeout      = Timeouts(options.timeout, options.global_timeout)
+        output_width = 24
 
 
-def updateMakeCmd(force, jobs):
+def update_make_cmd(force, jobs):
         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:
@@ -139 +140 @@
 
         tools.rm(errf)
+
+def prep_output(tests):
+        global output_width
+        output_width = max(map(lambda t: len(t.target()), tests))