diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-15 16:25:30 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-15 16:25:30 +0000 |
commit | a4832af52e00a15cc9c66fede80a489d8ce10605 (patch) | |
tree | 2e612d42c709ccc9f440efe912c01be0c5a88ec9 /c/src/lib/libbsp/mips/jmr3904/tools | |
parent | 1572e389ff6ca374d374eb9b8bb081cc1b2aa74f (diff) |
2008-08-15 Joel Sherrill <joel.sherrill@OARcorp.com>
* runtest: Attempt to prevent runaways.
Diffstat (limited to 'c/src/lib/libbsp/mips/jmr3904/tools')
-rw-r--r-- | c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog | 4 | ||||
-rwxr-xr-x | c/src/lib/libbsp/mips/jmr3904/tools/runtest | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog index 31f331e0eb..6bba14ade2 100644 --- a/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog @@ -1,3 +1,7 @@ +2008-08-15 Joel Sherrill <joel.sherrill@OARcorp.com> + + * runtest: Attempt to prevent runaways. + 2008-08-11 Joel Sherrill <joel.sherrill@OARcorp.com> * runtest: Major update. Now more likely not to run away. diff --git a/c/src/lib/libbsp/mips/jmr3904/tools/runtest b/c/src/lib/libbsp/mips/jmr3904/tools/runtest index 62d693921c..3d94546d90 100755 --- a/c/src/lib/libbsp/mips/jmr3904/tools/runtest +++ b/c/src/lib/libbsp/mips/jmr3904/tools/runtest @@ -128,7 +128,7 @@ args=$* tests="$args" if [ ! "$tests" ] then - set -- `echo *.exe` + set -- `ls -1 *.exe *.ralf 2>/dev/null` tests="$*" fi @@ -215,7 +215,7 @@ do # Spin off the simulator in the background - ${simulator} --board=jmr3904 $tfile | \ + ${simulator} --board=jmr3904 $tfile </dev/null | \ sed -e 's/
//' -e '/^$/d' > ${logfile} 2>&1 & pid=$! @@ -233,8 +233,8 @@ do if [ $running -eq 0 ] ; then if [ ${milliseconds} -ge ${millilimit} ]; then kill -9 $pid 2> /dev/null - cat ${logfile} - echo "${testname} killed after running ${max_run_time} seconds" + #cat ${logfile} + echo "${tname} killed after running ${max_run_time} seconds" break fi grep "^Unhandled exception" ${logfile} >/dev/null @@ -243,14 +243,14 @@ do badAccessExit=$? if [ $badAccessExit -eq 0 -o $exceptionExit -eq 0 ] ; then kill -9 ${pid} >/dev/null 2>&1 - cat ${logfile} - echo Ran in ${milliseconds} milliseconds + #cat ${logfile} + # echo Ran in ${milliseconds} milliseconds fi else # done normally - cat ${logfile} - echo "${testname} ran in ${milliseconds} milliseconds" + # cat ${logfile} + # echo "${tname} ran in ${milliseconds} milliseconds" break fi done |