diff options
Diffstat (limited to 'sim/testsuite')
| -rw-r--r-- | sim/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/testsuite/lib/sim-defs.exp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 6de8bdc..55ef169 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2015-03-29 Mike Frysinger <vapier@gentoo.org> + * lib/sim-defs.exp (run_sim_test): Declare seen_output as 0. When + the test has an output keyword, set it to 1. Set default output only + when seen_output is 0. + +2015-03-29 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2015-03-28 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp index c8093a2..fb2346a 100644 --- a/sim/testsuite/lib/sim-defs.exp +++ b/sim/testsuite/lib/sim-defs.exp @@ -218,6 +218,7 @@ proc run_sim_test { name requested_machs } { set opts(xerror) "no" set opts(xfail) "" set opts(kfail) "" + set seen_output 0 if ![info exists global_as_options] { set global_as_options "" @@ -260,6 +261,7 @@ proc run_sim_test { name requested_machs } { # Multiple "output" specifications concatenate, they don't override. if { $opt_name == "output" } { set opt_val "$opts(output)$opt_val" + set seen_output 1 } # Similar with "xfail" and "kfail", but arguments are space-separated. if { $opt_name == "xfail" || $opt_name == "kfail" } { @@ -276,7 +278,7 @@ proc run_sim_test { name requested_machs } { set testname $name set sourcefile $file - if { $opts(output) == "" } { + if { $seen_output == 0 } { if { "$opts(xerror)" == "no" } { set opts(output) "pass\n" } else { |