Changeset cc9b520 for tests/test.py
- Timestamp:
- Mar 9, 2022, 7:59:46 PM (2 years ago)
- Branches:
- ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum
- Children:
- b053083
- Parents:
- 5baa33c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tests/test.py
r5baa33c rcc9b520 195 195 # build, skipping to next test on error 196 196 with Timed() as comp_dur: 197 make_ret, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )197 make_ret, _, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file ) 198 198 199 199 # ---------- … … 208 208 if settings.dry_run or is_exe(exe_file): 209 209 # run test 210 retcode, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True)210 retcode, _, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True) 211 211 else : 212 212 # simply cat the result into the output … … 226 226 else : 227 227 # fetch return code and error from the diff command 228 retcode, error = diff(cmp_file, out_file)228 retcode, error, _ = diff(cmp_file, out_file) 229 229 230 230 else: … … 235 235 error = "Output log can't be read, file is bigger than 1MB, see {} for actual error\n".format(out_file) 236 236 237 ret, info = core_info(exe_file) 238 error = error + info if error else info 237 ret, info, gdberr = core_info(exe_file) 238 if ret == 0: 239 error = error + info if error else info 240 else : 241 error = error + gdberr if error else gdberr 239 242 240 243 if settings.archive: … … 366 369 print(os.path.relpath(t.expect(), settings.SRCDIR), end=' ') 367 370 print(os.path.relpath(t.input() , settings.SRCDIR), end=' ') 368 code, out = make_recon(t.target())371 code, out, err = make_recon(t.target()) 369 372 370 373 if code != 0: 371 print('ERROR: recond failed for test {} '.format(t.target()), file=sys.stderr)374 print('ERROR: recond failed for test {}: {} \'{}\''.format(t.target(), code, err), file=sys.stderr) 372 375 sys.exit(1) 373 376
Note: See TracChangeset
for help on using the changeset viewer.