Changeset 126e54f

Timestamp:

Sep 9, 2016, 11:26:50 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

03e3117, b6424d9

Parents:

7d05e7e (diff), 850fda6 (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' of plg2:software/cfa/cfa-cc

File:

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

src/tests/test.py

@@ -285 +285 @@
 # check if the user already passed in a number of jobs for multi-threading
 make_flags = environ.get('MAKEFLAGS')
-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_jobs_fds = re.search("--jobserver-fds=\s*([0-9]+),([0-9]+)", make_flags) if make_flags else None
+if make_jobs_fds :
+        tokens = os.read(int(make_jobs_fds.group(1)), 1024)
+        options.jobs = len(tokens)
+        os.write(int(make_jobs_fds.group(2)), tokens)
 
 # make sure we have a valid number of jobs that corresponds to user input
-options.jobs = int(make_max_jobs) if make_max_jobs else (options.jobs if options.jobs else 1)
 if options.jobs <= 0 :
         print('ERROR: Invalid number of jobs', file=sys.stderr)
@@ -296 +297 @@
 
 print('Running on %i cores' % options.jobs)
+make_cmd = "make" if make_flags else ("make -j%i" % options.jobs)
 
 # users may want to simply list the tests