aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/testsuite/ChangeLog5
-rw-r--r--sim/testsuite/lib/sim-defs.exp4
2 files changed, 9 insertions, 0 deletions
diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index f461c15..9c8b240 100644
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-16 Hans-Peter Nilsson <hp@axis.com>
+
+ * lib/sim-defs.exp (run_sim_test): Make multiple "output"
+ specifications concatenate, not override.
+
2004-10-26 Nick Clifton <nickc@redhat.com>
* lib/sim-defs.exp (sim_run): Add support for the "rawsid"
diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index 07aa6cc..5b7b1f2 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -229,6 +229,10 @@ proc run_sim_test { name requested_machs } {
unresolved $subdir/$name
return
}
+ # Multiple "output" specifications concatenate, they don't override.
+ if { $opt_name == "output" } {
+ set opt_val "$opts(output)$opt_val"
+ }
foreach m $opt_machs {
set opts($opt_name,$m) $opt_val
}