Changeset cc9b520 for tests/test.py

Timestamp:

Mar 9, 2022, 7:59:46 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b053083

Parents:

5baa33c

Message:

Clean-up error handling in test scripts

File:

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

tests/test.py

@@ -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:
@@ -235 +235 @@
                                 error = "Output log can't be read, file is bigger than 1MB, see {} for actual error\n".format(out_file)
 
-                        ret, info = core_info(exe_file)
-                        error = error + info if error else info
+                        ret, info, gdberr = core_info(exe_file)
+                        if ret == 0:
+                                error = error + info if error else info
+                        else :
+                                error = error + gdberr if error else gdberr
 
                         if settings.archive:
@@ -366 +369 @@
                         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)