Changeset ef56087

Timestamp:

Mar 7, 2022, 7:38:52 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

5baa33c

Parents:

fc01219

Message:

Fixed test.py to support -j.
(unlimited jobs)

Location:

tests

Files:

• pybin/tools.py (modified) (5 diffs)
• test.py (modified) (1 diff)

tests/pybin/tools.py

@@ -322 +322 @@
         # tell make about the pipes
         os.environ["MAKEFLAGS"] = os.environ["MFLAGS"] = " ".join(make_flags)
-        print(os.environ["MFLAGS"])
 
         # make sure pass the pipes to our children
@@ -328 +327 @@
 
         return make_flags
+
+def prep_unlimited_recursive_make():
+        # prep the flags for make
+        make_flags = ["-j"]
+
+        # tell make about the pipes
+        os.environ["MAKEFLAGS"] = os.environ["MFLAGS"] = "-j"
+
+        return make_flags
+
+
+def eval_hardware():
+        # we can create as many things as we want
+        # how much hardware do we have?
+        if settings.distribute:
+                # remote hardware is allowed
+                # how much do we have?
+                ret, jstr = sh("distcc", "-j", output_file=subprocess.PIPE, ignore_dry_run=True)
+                return int(jstr.strip()) if ret == 0 else multiprocessing.cpu_count()
+        else:
+                # remote isn't allowed, use local cpus
+                return multiprocessing.cpu_count()
 
 # count number of jobs to create
@@ -375 +396 @@
                                 sys.exit(1)
 
-                        # we can create as many things as we want
-                        # how much hardware do we have?
-                        if settings.distribute:
-                                # remote hardware is allowed
-                                # how much do we have?
-                                ret, jstr = sh("distcc", "-j", output_file=subprocess.PIPE, ignore_dry_run=True)
-                                options.jobs = int(jstr.strip()) if ret == 0 else multiprocessing.cpu_count()
-                        else:
-                                # remote isn't allowed, use local cpus
-                                options.jobs = multiprocessing.cpu_count()
-
-                        make_flags = prep_recursive_make(options.jobs)
+                        options.jobs = eval_hardware()
+                        flags = prep_unlimited_recursive_make()
 
 
@@ -397 +408 @@
 
         # Arguments are calling the shots, fake the top level make
-        elif options.jobs:
+        elif options.jobs :
+
                 # make sure we have a valid number of jobs that corresponds to user input
-                if options.jobs <= 0 :
+                if options.jobs < 0 :
                         print('ERROR: Invalid number of jobs', file=sys.stderr)
                         sys.exit(1)
 
                 flags = prep_recursive_make(options.jobs)
+
+        # Arguments are calling the shots, fake the top level make, but 0 is a special case
+        elif options.jobs == 0:
+                options.jobs = eval_hardware()
+                flags = prep_unlimited_recursive_make()
 
         # No one says to run in parallel, then don't
@@ -412 +429 @@
         # Make sure we call make as expected
         settings.update_make_cmd( flags )
+        print(flags)
+        print(os.environ.get('MAKEFLAGS'))
 
         # return the job count

tests/test.py

@@ -140 +140 @@
         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('--archive-errors', help='If called with a valid path, on test crashes the test script will copy the core dump and the executable to the specified path.', type=str, default='')
-        parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int)
+        parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously, 0 (default) for unlimited', nargs='?', const=0, type=int)
         parser.add_argument('--list-comp', help='List all valide arguments', action='store_true')
         parser.add_argument('--list-dist', help='List all tests for distribution', action='store_true')