Changeset 74358c3

Timestamp:

Jun 27, 2016, 11:52:11 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

d5b904d

Parents:

622c35a

Message:

removed issues with forced -jN option in submake

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 -j 8 %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_cmd = "$(MAKE)" if environ.get('MAKELEVEL') else "make"
+
 if options.list :
         print("\n".join(tests))