Changeset 52c97dd for src/tests

Timestamp:

Jul 15, 2016, 4:10:11 PM (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, 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:

b8303f44

Parents:

911348cd

Message:

fixed make flags for nested make levels in tests

File:

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

src/tests/test.py

@@ -181 +181 @@
         for t in tests:
                 # print formated name
-                print("%20s  " % t.name, end="")
-                sys.stdout.flush()
+                name_txt = "%20s  " % t.name
 
                 #run the test instance and collect the result
@@ -199 +198 @@
 
                 #print result with error if needed
-                print(failed_txt if test_failed else success_txt)
+                text = name_txt + (failed_txt if test_failed else success_txt)
+                out = sys.stdout
                 if error :
-                        print(error, file=sys.stderr)
+                        text = text + "\n" + error
+                        out = sys.stderr
+
+                print(text, file = out);
 
         #clean the workspace
@@ -217 +220 @@
 parser.add_argument('--all', help='Run all test available', action='store_true')
 parser.add_argument('--regenerate-expected', help='Regenerate the .expect by running the specified tets, can be used with --all option', action='store_true')
-parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int, default='1')
+parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int, default='8')
 parser.add_argument('tests', metavar='test', type=str, nargs='*', help='a list of tests to run')
 
@@ -266 +269 @@
 # check if the user already passed in a number of jobs for multi-threading
 make_flags = environ.get('MAKEFLAGS')
-make_has_max_jobs = make_flags and "-j" in make_flags
-make_max_jobs = re.search("(-j|--jobs)\s*([0-9]+)", make_flags).group(2) if make_has_max_jobs else None
-make_cmd = "make" if make_has_max_jobs else "make -j8"
+make_has_max_jobs = re.search("(-j|--jobs)\s*([0-9]+)", make_flags) if make_flags else None
+make_max_jobs = make_has_max_jobs.group(2) if make_has_max_jobs else None
+make_cmd = "make" if make_flags and "-j" in make_flags else "make -j8"
 
 # make sure we have a valid number of jobs that corresponds to user input
@@ -276 +279 @@
         sys.exit(1)
 
-
 # users may want to simply list the tests
 if options.list :
@@ -283 +285 @@
 else :
         # otherwise run all tests and make sure to return the correct error code
-        sys.exit( run_tests(tests, options.regenerate_expected, options.dry_run) )
+        sys.exit( run_tests(tests, options.regenerate_expected, options.dry_run, options.jobs) )