Changeset 92538ab for tests/test.py

Timestamp:

Apr 10, 2022, 2:53:18 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• tests/test.py (modified) (9 diffs)

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')
@@ -195 +195 @@
         # build, skipping to next test on error
         with Timed() as comp_dur:
-                make_ret, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )
+                make_ret, _, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )
 
         # ----------
@@ -208 +208 @@
                                 if settings.dry_run or is_exe(exe_file):
                                         # run test
-                                        retcode, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True)
+                                        retcode, _, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True)
                                 else :
                                         # simply cat the result into the output
@@ -226 +226 @@
                         else :
                                 # fetch return code and error from the diff command
-                                retcode, error = diff(cmp_file, out_file)
+                                retcode, error, _ = diff(cmp_file, out_file)
 
                 else:
@@ -366 +366 @@
                         print(os.path.relpath(t.expect(), settings.SRCDIR), end=' ')
                         print(os.path.relpath(t.input() , settings.SRCDIR), end=' ')
-                        code, out = make_recon(t.target())
+                        code, out, err = make_recon(t.target())
 
                         if code != 0:
-                                print('ERROR: recond failed for test {}'.format(t.target()), file=sys.stderr)
+                                print('ERROR: recond failed for test {}: {} \'{}\''.format(t.target(), code, err), file=sys.stderr)
                                 sys.exit(1)
 
@@ -417 +417 @@
                         if is_empty(t.expect()):
                                 print('WARNING: test "{}" has empty .expect file'.format(t.target()), file=sys.stderr)
+
+        options.jobs = job_count( options )
 
         # for each build configurations, run the test
@@ -430 +432 @@
                         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 +441 @@
                                 'Regenerating' if settings.generating else 'Running',
                                 len(local_tests),
-                                options.jobs,
+                                jobs,
                                 settings.ast.string,
                                 settings.arch.string,
@@ -450 +451 @@
 
                         # 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_: