Commit e2dd02c3 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Don't dump stderr/stdout before we've split the ghci output

Fixes some framework failures.
parent d8127ca3
......@@ -725,13 +725,6 @@ def interpreter_run( name, way, extra_hc_opts, compile_only, top_mod ):
exit_code = result >> 8
signal = result & 0xff
# check the exit code
if exit_code != getTestOpts().exit_code:
print 'Wrong exit code (expected', getTestOpts().exit_code, ', actual', exit_code, ')'
dump_stdout(name)
dump_stderr(name)
return 'fail'
# split the stdout into compilation/program output
split_file(in_testdir(outname), delimiter,
qualify(name, 'comp.stdout'),
......@@ -740,6 +733,13 @@ def interpreter_run( name, way, extra_hc_opts, compile_only, top_mod ):
qualify(name, 'comp.stderr'),
qualify(name, 'run.stderr'))
# check the exit code
if exit_code != getTestOpts().exit_code:
print 'Wrong exit code (expected', getTestOpts().exit_code, ', actual', exit_code, ')'
dump_stdout(name)
dump_stderr(name)
return 'fail'
# ToDo: if the sub-shell was killed by ^C, then exit
if getTestOpts().ignore_output or (check_stderr_ok(name) and
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment