Changeset 9cd44ba

Timestamp:

Mar 3, 2022, 2:43:18 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d529ad0

Parents:

d9d8b9f

Message:

change tests to evaluate -j option once

Location:

tests

Files:

• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (4 diffs)

tests/pybin/tools.py

@@ -290 +290 @@
 ################################################################################
 # count number of jobs to create
-def job_count( options, tests ):
+def job_count( options ):
         # check if the user already passed in a number of jobs for multi-threading
         if not options.jobs:
@@ -317 +317 @@
                 sys.exit(1)
 
-        return min( options.jobs, len(tests) ), force
+        return options.jobs, force
 
 # enable core dumps for all the test children

tests/test.py

@@ -418 +418 @@
                                 print('WARNING: test "{}" has empty .expect file'.format(t.target()), file=sys.stderr)
 
+        options.jobs, forceJobs = job_count( options )
+        settings.update_make_cmd(forceJobs, options.jobs)
+
         # for each build configurations, run the test
         with Timed() as total_dur:
@@ -430 +433 @@
                         local_tests = settings.ast.filter( tests )
                         local_tests = settings.arch.filter( local_tests )
-                        options.jobs, forceJobs = job_count( options, local_tests )
-                        settings.update_make_cmd(forceJobs, options.jobs)
 
                         # check the build configuration works
                         settings.validate()
+                        jobs = min(options.jobs, len(local_tests))
 
                         # print configuration
@@ -440 +442 @@
                                 'Regenerating' if settings.generating else 'Running',
                                 len(local_tests),
-                                options.jobs,
+                                jobs,
                                 settings.ast.string,
                                 settings.arch.string,
@@ -450 +452 @@
 
                         # otherwise run all tests and make sure to return the correct error code
-                        failed = run_tests(local_tests, options.jobs)
+                        failed = run_tests(local_tests, jobs)
                         if failed:
                                 if not settings.continue_: