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

Rewrite the result testing logic in simple_run

parent b703efce
...@@ -807,15 +807,18 @@ def simple_run( name, way, prog, args ): ...@@ -807,15 +807,18 @@ def simple_run( name, way, prog, args ):
check_hp = my_rts_flags.find("-h") != -1 check_hp = my_rts_flags.find("-h") != -1
check_prof = my_rts_flags.find("-p") != -1 check_prof = my_rts_flags.find("-p") != -1
if opts.ignore_output or \ if not opts.ignore_output:
(check_stderr_ok(name) and if not check_stderr_ok(name):
check_stdout_ok(name) and return 'fail'
(not check_hp or (exit_code > 127 and exit_code != 251) or check_hp_ok(name)) and if not check_stdout_ok(name):
(not check_prof or check_prof_ok(name))): return 'fail'
# exit_code > 127 probably indicates a crash, so don't try to run hp2ps. # exit_code > 127 probably indicates a crash, so don't try to run hp2ps.
return 'pass' if check_hp and (exit_code <= 127 or exit_code == 251) and not check_hp_ok(name):
else: return 'fail'
return 'fail' if check_prof and not check_prof_ok(name):
return 'fail'
return 'pass'
def rts_flags(way): def rts_flags(way):
if (way == ''): if (way == ''):
......
Supports Markdown
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