2009-09-24 Joel Sherrill <joel.sherrill@OARcorp.com>

	* gdb-sim-run.in, qemu-rtems.in: Minor cleanup. Remove bogus output.

3 files changed, 12 insertions, 2 deletions

diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index 653d8e0..e7c920f 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-24	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* gdb-sim-run.in, qemu-rtems.in: Minor cleanup. Remove bogus output.
+
 2009-09-23	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* .cvsignore, Makefile: Add lm32_evr simulator script support.
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index 66d704d..4b5ae40 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -262,7 +262,7 @@ runtest()
   max_run_time=${3}
 
   # Just in case the simulator aborts and messes up the terminal
-  trap "test ${bspNeedsSttySane} = yes && stty sane" SIGABRT return
+  trap "test ${bspNeedsSttySane} = yes && stty sane 2>/dev/null" SIGABRT return
 
   test ${verbose} == 'yes' && echo ${runBSP} `runARGS ${testname}`
 
@@ -289,8 +289,10 @@ runtest()
     catLog ${logfile}
     return
   fi
+
   ${runBSP} `runARGS ${testname}` >${logfile} 2>&1 &
   pid=$!
+
   # Make sure it won't run forever...
   millilimit=`expr ${max_run_time} \* 1000`
   milliseconds=0
diff --git a/sim-scripts/qemu-rtems.in b/sim-scripts/qemu-rtems.in
index 8faeffd..56a115b 100644
--- a/sim-scripts/qemu-rtems.in
+++ b/sim-scripts/qemu-rtems.in
@@ -48,13 +48,17 @@ runARGS()
     echo "MUST BE ELF -- look at using the .exe"
     exit 1
   fi
+
   cp ${1} ${hd0Dir}/test.exe
 
   if [ ${coverage} = yes ] ; then
      COVERAGE_ARG="-trace ${1}.tra"
   fi
+
+  # can also redirect to file with file:log/"`basename ${1} .exe`
+  SERIAL_ARG="stdio"
   echo "-m 8 -boot a -fda ${fd0Image} -hda fat:${hd0Dir} ${COVERAGE_ARG} \
-         -monitor null -nographic -serial stdio --no-reboot"
+         -monitor null -nographic -serial ${SERIAL_ARG} --no-reboot"
 }
 
 checkBSPFaults()