2008-08-07 Joel Sherrill <joel.sherrill@OARcorp.com>

* runtest: Major update. Now more likely not to run away.

c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog

@@ -1,3 +1,7 @@
+2008-08-07	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* runtest: Major update. Now more likely not to run away.
+
 2008-08-05	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* runtest: Strip .exe or .ralf from file names.

c/src/lib/libbsp/mips/jmr3904/tools/runtest

@@ -215,32 +215,45 @@ do
           fatal "Cannot currently generate device files"
      fi
 
-     # Spin off the simulator in the background
+     # Spin off the simulator in the background
-
+
-       ${simulator} --board=jmr3904 $tfile | \
+     ${simulator} --board=jmr3904 $tfile | \
        sed -e 's/
-//' -e '/^$/d' > ${logfile} 2>&1 &
+//' -e '/^$/d' > ${logfile} 2>&1 &
-       pid=$!
+     pid=$!
-
+
-       # Make sure it won't run forever...
+     # Make sure it won't run forever...
-       time_run=0
+     millilimit=`expr ${max_run_time} \* 1000`
-       while [ $time_run -lt $max_run_time ]
+     milliseconds=0
-       do
+     while :
-           # sleep 5s at a time waiting for job to finish or timer to expire
+     do
-           # if job has exited, then we exit, too.
+       # sleep 10ms at a time waiting for job to finish or timer to expire
-           sleep 5
+       # if job has exited, then we exit, too.
-           kill -0 $pid 2> /dev/null
+       usleep 10000  # ten milliseconds
-           running=$?
+       milliseconds=`expr ${milliseconds} + 10`
-           if [ $running -eq 0 ]
+       kill -0 $pid 2> /dev/null
-           then
+       running=$?
-               time_run=$((time_run + 5))
+       if [ $running -eq 0 ] ; then
-               if [ $time_run -ge $max_run_time ]
+	 if [ ${milliseconds} -ge ${millilimit} ]; then
-               then
+	   kill -9 $pid 2> /dev/null
-                   kill -9 $pid 2> /dev/null
+	   cat ${logfile}
-                   ran_too_long="yes"
+	   echo "${testname} killed after running ${max_run_time} seconds"
-               fi
+	   break
-           else
+	 fi
-               ran_too_long="no"
+	 grep "^Unhandled exception" ${logfile} >/dev/null
+	 exceptionExit=$?
+	 grep "^mips-core: " ${logfile} >/dev/null
+	 badAccessExit=$?
+	 if [ $badAccessExit -eq 0 -o $exceptionExit -eq 0 ] ; then
+	   kill -9 ${pid} >/dev/null 2>&1
+	   cat ${logfile}
+	   echo Ran in ${milliseconds} milliseconds
+	 fi
+
+       else
+	 # done normally
+	 cat ${logfile}
+	 echo "${testname} ran in ${milliseconds} milliseconds"
 	 break
        fi
      done