Changeset 21bdce2 for src/tests/pybin/tools.py

Timestamp:

May 21, 2018, 10:52:15 PM (7 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, with_gc

Children:

2f0a0678

Parents:

b12c036 (diff), 1596726 (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/pybin/tools.py (modified) (2 diffs)

src/tests/pybin/tools.py

@@ -168 +168 @@
 def jobCount( options, tests ):
         # check if the user already passed in a number of jobs for multi-threading
-        make_flags = os.environ.get('MAKEFLAGS')
-        make_jobs_fds = re.search("--jobserver-(auth|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(2)), 1024)
-                options.jobs = len(tokens)
-                os.write(int(make_jobs_fds.group(3)), tokens)
+        if not options.jobs:
+                make_flags = os.environ.get('MAKEFLAGS')
+                force = bool(make_flags)
+                make_jobs_fds = re.search("--jobserver-(auth|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(2)), 1024)
+                        options.jobs = len(tokens)
+                        os.write(int(make_jobs_fds.group(3)), tokens)
+                else :
+                        options.jobs = multiprocessing.cpu_count()
         else :
-                options.jobs = multiprocessing.cpu_count()
+                force = True
 
         # make sure we have a valid number of jobs that corresponds to user input
@@ -182 +186 @@
                 sys.exit(1)
 
-        return min( options.jobs, len(tests) ), True if make_flags else False
+        return min( options.jobs, len(tests) ), force
 
 # setup a proper processor pool with correct signal handling