diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-05-10 20:31:15 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-05-10 20:31:15 +0000 |
| commit | ef308ab9d4fb354c0ffa4e9181b94648e86d1c6a (patch) | |
| tree | 3e7c2debd6d5b419bcf9e161fa7df9a704a3d85e /sim-scripts | |
| parent | b2cc190a9956452770dccc4dfe733b21ce83fa73 (diff) | |
2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com>
* gdb-sim-run.in: Use 50 millisecond per period.
* pc386.in: Switch from 486 to qemu32 CPU model.
* qemu-lm32_evr.in: Increase time limits on some tests.
Diffstat (limited to 'sim-scripts')
| -rw-r--r-- | sim-scripts/ChangeLog | 6 | ||||
| -rwxr-xr-x | sim-scripts/gdb-sim-run.in | 4 | ||||
| -rw-r--r-- | sim-scripts/pc386.in | 3 | ||||
| -rw-r--r-- | sim-scripts/qemu-lm32_evr.in | 5 |
4 files changed, 13 insertions, 5 deletions
diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog index 791ebe0..feac307 100644 --- a/sim-scripts/ChangeLog +++ b/sim-scripts/ChangeLog @@ -1,3 +1,9 @@ +2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * gdb-sim-run.in: Use 50 millisecond per period. + * pc386.in: Switch from 486 to qemu32 CPU model. + * qemu-lm32_evr.in: Increase time limits on some tests. + 2010-04-20 Joel Sherrill <joel.sherrilL@oarcorp.com> * .cvsignore, Makefile, bf537Stamp.in, ezkit533.in: Move current diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in index 1a3273e..9bcfea0 100755 --- a/sim-scripts/gdb-sim-run.in +++ b/sim-scripts/gdb-sim-run.in @@ -320,8 +320,8 @@ runtest() do # sleep 10ms at a time waiting for job to finish or timer to expire # if job has exited, then we exit, too. - usleep 25000 # twenty five milliseconds - milliseconds=`expr ${milliseconds} + 25` + usleep 50000 # fifty milliseconds + milliseconds=`expr ${milliseconds} + 50` kill -0 $pid 2> /dev/null running=$? if [ $running -eq 0 ] ; then diff --git a/sim-scripts/pc386.in b/sim-scripts/pc386.in index 106bd83..bd9b359 100644 --- a/sim-scripts/pc386.in +++ b/sim-scripts/pc386.in @@ -56,10 +56,11 @@ runARGS() COVERAGE_ARG="-trace ${1}.cov" fi + # -cpu 486 # 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} \ - -cpu 486 -monitor null -nographic -serial ${SERIAL_ARG} --no-reboot" + -monitor null -nographic -serial ${SERIAL_ARG} --no-reboot" } checkBSPFaults() diff --git a/sim-scripts/qemu-lm32_evr.in b/sim-scripts/qemu-lm32_evr.in index c8009a1..559ad02 100644 --- a/sim-scripts/qemu-lm32_evr.in +++ b/sim-scripts/qemu-lm32_evr.in @@ -24,7 +24,7 @@ runARGS() COVERAGE_ARG="-trace ${1}.tra" fi - echo "-M lm32-evr -nographic ${COVERAGE_ARG} -kernel ${1}" + echo "-M lm32-evr -nographic ${COVERAGE_ARG} -global lm32,sys.enabled=1 -kernel ${1}" } checkBSPFaults() @@ -39,7 +39,8 @@ bspLimit() *stackchk*)limit=5 ;; *fatal*) limit=1 ;; *minimum*) limit=1 ;; - *psxtime*) limit=270 ;; + *sp20*) limit=180 ;; # 2 min 32 seconds on Joel's laptop + *psxtime*) limit=390 ;; # 6 min 2 seconds on Joel's laptop *) limit=60 ;; esac echo ${limit} |