Changeset 4dcea3f for src/tests/test.py

Timestamp:

Jun 28, 2016, 3:33:05 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

982d63f

Parents:

e39aa0f (diff), 2e04c7b3 (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 ctor

File:

• src/tests/test.py (modified) (4 diffs)

src/tests/test.py

@@ -61 +61 @@
 
         # build, skipping to next test on error
-        make_ret = sh("make -j 8 %s 2> %s 1> /dev/null" % (test, out_file), dry_run)
+        make_ret = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
 
         if make_ret == 0 :
@@ -84 +84 @@
 
 def run_tests(tests, generate, dry_run) :
-        sh('make clean > /dev/null 2>&1', dry_run)
+        sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
         sh('mkdir -p .out .expect', dry_run)
 
@@ -102 +102 @@
                         print( "Done" )
 
-        sh('make clean > /dev/null 2>&1', dry_run)
+        sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
 
         return 1 if failed else 0
@@ -141 +141 @@
                 sys.exit(1)
 
+tests.sort()
+make_flags = environ.get('MAKEFLAGS')
+make_cmd = "make" if make_flags and "-j" in make_flags else "make -j8"
+
 if options.list :
         print("\n".join(tests))