<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems-testing (2010-07-08)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-07-08 Sebastian Huber <sebastian.huber@embedded-brains.de>
* gdb-sim-run.in: Changed non-interactive test run status messages.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/sim-scripts/ChangeLog.diff?r1=text&tr1=1.86&r2=text&tr2=1.87&diff_format=h">M</a></td><td width='1%'>1.87</td><td width='100%'>sim-scripts/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/sim-scripts/gdb-sim-run.in.diff?r1=text&tr1=1.44&r2=text&tr2=1.45&diff_format=h">M</a></td><td width='1%'>1.45</td><td width='100%'>sim-scripts/gdb-sim-run.in</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/sim-scripts/ChangeLog:1.86 rtems-testing/sim-scripts/ChangeLog:1.87
--- rtems-testing/sim-scripts/ChangeLog:1.86 Wed Jul 7 04:49:38 2010
+++ rtems-testing/sim-scripts/ChangeLog Thu Jul 8 03:18:50 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-07-08 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * gdb-sim-run.in: Changed non-interactive test run status messages.
+
</font> 2010-07-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
* gdb-sim-run.in, skyeye-support: Removed special case for fatal
<font color='#006600'>diff -u rtems-testing/sim-scripts/gdb-sim-run.in:1.44 rtems-testing/sim-scripts/gdb-sim-run.in:1.45
--- rtems-testing/sim-scripts/gdb-sim-run.in:1.44 Wed Jul 7 04:49:39 2010
+++ rtems-testing/sim-scripts/gdb-sim-run.in Thu Jul 8 03:18:50 2010
</font><font color='#997700'>@@ -285,7 +285,6 @@
</font> return
fi
<font color='#880000'>- echo Running ${testname} for maximum ${max_run_time} seconds
</font> echo $testname | grep "exe$" >/dev/null
tname=`get_tname $testname`
<font color='#997700'>@@ -311,9 +310,10 @@
</font> # Make sure it won't run forever...
millilimit=`expr ${max_run_time} \* 1000`
milliseconds=0
<font color='#000088'>+ echo -n "running ${testname} for maximum ${max_run_time} seconds... "
</font> while :
do
<font color='#880000'>- # sleep 10ms at a time waiting for job to finish or timer to expire
</font><font color='#000088'>+ # sleep 50ms at a time waiting for job to finish or timer to expire
</font> # if job has exited, then we exit, too.
usleep 50000 # fifty milliseconds
milliseconds=`expr ${milliseconds} + 50`
<font color='#997700'>@@ -322,8 +322,7 @@
</font> if [ $running -eq 0 ] ; then
if [ ${milliseconds} -ge ${millilimit} ]; then
killpid ${pid}
<font color='#880000'>- catLog ${logfile}
- echo "${testname} killed after running ${max_run_time} seconds"
</font><font color='#000088'>+ echo -n "killed due to over time... "
</font> break
fi
if [ ! -r ${logfile} ] ; then
<font color='#997700'>@@ -331,24 +330,25 @@
</font> fi
# check for BSP specific messages which indicate program ended
checkBSPFaults ${logfile} >/dev/null 2>&1
<font color='#880000'>- bspFaults=$?
</font><font color='#000088'>+ if [ $? -ne 0 ] ; then
+ killpid ${pid}
+ echo -n "killed due to BSP fault... "
+ break
+ fi
</font> # check for cross platform messages which indicate program ended
checkGenericExits ${logfile} #>/dev/null 2>&1
<font color='#880000'>- genericExits=$?
- if [ ${bspFaults} -ne 0 -o ${genericExits} -ne 0 ] ; then
</font><font color='#000088'>+ if [ $? -ne 0 ] ; then
</font> killpid ${pid}
<font color='#880000'>- catLog ${logfile}
- echo Ran in ${milliseconds} milliseconds
- break
</font><font color='#000088'>+ echo -n "killed due to generic exit... "
+ break
</font> fi
<font color='#880000'>- else
- # done normally
- catLog ${logfile}
- test ${verbose} = "yes" && \
- echo "${testname} ran in ${milliseconds} milliseconds"
- break
- fi
</font><font color='#000088'>+ else
+ # done normally
+ break
+ fi
</font> done
<font color='#000088'>+ catLog ${logfile}
+ echo "${milliseconds} ms run time"
</font> }
if [ "X${args}" = "X" ] ; then
<font color='#997700'>@@ -404,7 +404,7 @@
</font> ## in batch mode, skip it.
case ${toRun} in
monitor*|termios.*|fileio*|capture*)
<font color='#880000'>- warn "Skipping ${toRun}; it is interactive"
</font><font color='#000088'>+ warn "skipping interactive ${toRun}"
</font> continue
;;
*-node2*)
<font color='#997700'>@@ -415,7 +415,7 @@
</font> warn "Running both nodes associated with ${toRun}"
;;
pppd*)
<font color='#880000'>- warn "Skipping ${toRun}; it locks up or takes a VERY long time to run"
</font><font color='#000088'>+ warn "skipping long running ${toRun}"
</font> continue
;;
esac
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>