2009-04-03 Joel Sherrill <joel.sherrill@rtems.org>

	* boards/rtems-arm-edb7312.exp, boards/rtems-arm-nosim.exp,
	boards/rtems-avr-avrtest.exp, boards/rtems-avr-nosim.exp,
	boards/rtems-bfin-nosim.exp, boards/rtems-h8300-h8sim.exp,
	boards/rtems-i386-qemu.exp, boards/rtems-m32c-m32csim.exp,
	boards/rtems-m32r-m32rsim.exp, boards/rtems-m68k-nosim.exp,
	boards/rtems-mips-jmr3904.exp, boards/rtems-powerpc-psim.exp,
	boards/rtems-sh-simsh1.exp, boards/rtems-sparc-sis.exp: Add
	sim,options

15 files changed, 38 insertions, 13 deletions

diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog
index 20dd89d..cd629e9 100644
--- a/dejagnu/ChangeLog
+++ b/dejagnu/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-03	Joel Sherrill <joel.sherrill@rtems.org>
+
+	* boards/rtems-arm-edb7312.exp, boards/rtems-arm-nosim.exp,
+	boards/rtems-avr-avrtest.exp, boards/rtems-avr-nosim.exp,
+	boards/rtems-bfin-nosim.exp, boards/rtems-h8300-h8sim.exp,
+	boards/rtems-i386-qemu.exp, boards/rtems-m32c-m32csim.exp,
+	boards/rtems-m32r-m32rsim.exp, boards/rtems-m68k-nosim.exp,
+	boards/rtems-mips-jmr3904.exp, boards/rtems-powerpc-psim.exp,
+	boards/rtems-sh-simsh1.exp, boards/rtems-sparc-sis.exp: Add
+	sim,options
+
 2009-04-01	Joel Sherrill <joel.sherrill@rtems.org>
 
 	* boards/rtems-mips-jmr3904.exp: Fix typo.
diff --git a/dejagnu/boards/rtems-arm-edb7312.exp b/dejagnu/boards/rtems-arm-edb7312.exp
index 7a3a418..d12d45b 100755
--- a/dejagnu/boards/rtems-arm-edb7312.exp
+++ b/dejagnu/boards/rtems-arm-edb7312.exp
@@ -28,6 +28,7 @@ set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
 set_board_info sim "edb7312"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-arm-nosim.exp b/dejagnu/boards/rtems-arm-nosim.exp
index a22d5ec..fec3459 100755
--- a/dejagnu/boards/rtems-arm-nosim.exp
+++ b/dejagnu/boards/rtems-arm-nosim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "nosim "
+set_board_info sim "nosim"
+## set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-avr-avrtest.exp b/dejagnu/boards/rtems-avr-avrtest.exp
index 45bf3ad..7f7ab87 100755
--- a/dejagnu/boards/rtems-avr-avrtest.exp
+++ b/dejagnu/boards/rtems-avr-avrtest.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "sis "
+set_board_info sim "sis"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-avr-nosim.exp b/dejagnu/boards/rtems-avr-nosim.exp
index b742237..098be8a 100755
--- a/dejagnu/boards/rtems-avr-nosim.exp
+++ b/dejagnu/boards/rtems-avr-nosim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "nosim "
+set_board_info sim "nosim"
+## set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-bfin-nosim.exp b/dejagnu/boards/rtems-bfin-nosim.exp
index 6432663..10d705a 100755
--- a/dejagnu/boards/rtems-bfin-nosim.exp
+++ b/dejagnu/boards/rtems-bfin-nosim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "nosim "
+set_board_info sim "nosim"
+##set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-h8300-h8sim.exp b/dejagnu/boards/rtems-h8300-h8sim.exp
index 850cc9b..3da3ec4 100755
--- a/dejagnu/boards/rtems-h8300-h8sim.exp
+++ b/dejagnu/boards/rtems-h8300-h8sim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "h8sim "
+set_board_info sim "h8sim"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-i386-qemu.exp b/dejagnu/boards/rtems-i386-qemu.exp
index ef51704..a0a53ff 100755
--- a/dejagnu/boards/rtems-i386-qemu.exp
+++ b/dejagnu/boards/rtems-i386-qemu.exp
@@ -46,7 +46,8 @@ set_board_info isremote 0
 # set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "qemu-rtems "
+set_board_info sim "qemu-rtems"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-m32c-m32csim.exp b/dejagnu/boards/rtems-m32c-m32csim.exp
index acf697e..8caff94 100755
--- a/dejagnu/boards/rtems-m32c-m32csim.exp
+++ b/dejagnu/boards/rtems-m32c-m32csim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "m32csim "
+set_board_info sim "m32csim"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-m32r-m32rsim.exp b/dejagnu/boards/rtems-m32r-m32rsim.exp
index 8eda143..4670610 100755
--- a/dejagnu/boards/rtems-m32r-m32rsim.exp
+++ b/dejagnu/boards/rtems-m32r-m32rsim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "m32rsim "
+set_board_info sim "m32rsim"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-m68k-nosim.exp b/dejagnu/boards/rtems-m68k-nosim.exp
index e3be64a..d736157 100755
--- a/dejagnu/boards/rtems-m68k-nosim.exp
+++ b/dejagnu/boards/rtems-m68k-nosim.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "nosim "
+set_board_info sim "nosim"
+##set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-mips-jmr3904.exp b/dejagnu/boards/rtems-mips-jmr3904.exp
index 69dd5f8..a9c5e82 100755
--- a/dejagnu/boards/rtems-mips-jmr3904.exp
+++ b/dejagnu/boards/rtems-mips-jmr3904.exp
@@ -30,7 +30,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "jmr3904 "
+set_board_info sim "jmr3904"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-powerpc-psim.exp b/dejagnu/boards/rtems-powerpc-psim.exp
index 3fee789..b6d305e 100755
--- a/dejagnu/boards/rtems-powerpc-psim.exp
+++ b/dejagnu/boards/rtems-powerpc-psim.exp
@@ -47,7 +47,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "psim -l 180"
+set_board_info sim "psim"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-sh-simsh1.exp b/dejagnu/boards/rtems-sh-simsh1.exp
index 8f6ae2f..724de22 100755
--- a/dejagnu/boards/rtems-sh-simsh1.exp
+++ b/dejagnu/boards/rtems-sh-simsh1.exp
@@ -27,7 +27,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "simsh "
+set_board_info sim "simsh"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-sparc-sis.exp b/dejagnu/boards/rtems-sparc-sis.exp
index 8570e4b..da9c0a3 100755
--- a/dejagnu/boards/rtems-sparc-sis.exp
+++ b/dejagnu/boards/rtems-sparc-sis.exp
@@ -28,7 +28,8 @@ set_board_info isremote 0
 set_board_info gcc,stack_size 2048
 
 # wrapper script which handles the device tree
-set_board_info sim "sis "
+set_board_info sim "sis"
+set_board_info sim,options "-i"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1