* lib/sim-defs.exp (run_sim_test): Make multiple "output"

	specifications concatenate, not override.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index f461c15c57e81a7e875efb26fa84cd343b262831..9c8b240f7573acc9621befa8d5d0cfc4d5793cb3 100644 (file)
--- 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 07aa6cca98dff657d5865bccd9d0f4de3af5ce44..5b7b1f22ea4531dfe97a49025aff36f947cf0bcc 100644 (file)
--- 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
        }