diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-03-20 19:41:25 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-03-20 19:41:25 +0000 |
commit | 055296cd34a03cb7b4e0dc532b7afae5a05a4ffc (patch) | |
tree | 8f7dd49502b8594fc5c7435add26ac1c80bd7042 | |
parent | 2009-03-20 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-testing-055296cd34a03cb7b4e0dc532b7afae5a05a4ffc.tar.bz2 |
2009-03-20 Joel Sherrill <joel.sherrill@OARcorp.com>
* edb7312.in, gdb-sim-run.in, skyeye-support, tsim-support: More
tunning on skyeye and erc32.
-rw-r--r-- | sim-scripts/ChangeLog | 5 | ||||
-rw-r--r-- | sim-scripts/edb7312.in | 12 | ||||
-rwxr-xr-x | sim-scripts/gdb-sim-run.in | 26 | ||||
-rw-r--r-- | sim-scripts/skyeye-support | 15 | ||||
-rw-r--r-- | sim-scripts/tsim-support | 2 |
5 files changed, 42 insertions, 18 deletions
diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog index 4c34169..fefa91a 100644 --- a/sim-scripts/ChangeLog +++ b/sim-scripts/ChangeLog @@ -1,3 +1,8 @@ +2009-03-20 Joel Sherrill <joel.sherrill@OARcorp.com> + + * edb7312.in, gdb-sim-run.in, skyeye-support, tsim-support: More + tunning on skyeye and erc32. + 2009-03-19 Joel Sherrill <joel.sherrill@OARcorp.com> * edb7312.in, gdb-sim-run.in: Now works ok on skyeye 1.2.6 diff --git a/sim-scripts/edb7312.in b/sim-scripts/edb7312.in index 90be431..1e601f8 100644 --- a/sim-scripts/edb7312.in +++ b/sim-scripts/edb7312.in @@ -17,18 +17,6 @@ checkBSPFaults() return $? } -bspLimit() -{ - testname=$1 - case ${tname} in - *stackchk*)limit=5 ;; - *fatal*) limit=1 ;; - *psxtime*) limit=180 ;; - *) limit=60 ;; - esac - return ${limit} -} - bspGeneratesDeviceTree="yes" bspTreeFile=edb7312.conf diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in index f0f9963..a269ae1 100755 --- a/sim-scripts/gdb-sim-run.in +++ b/sim-scripts/gdb-sim-run.in @@ -59,7 +59,7 @@ warn() { coverage="no" verbose="no" -limit="not_set" +defaultLimit="not_set" interactive="no" use_sysv_ipc="no" generate_tree_and_exit="no" @@ -71,7 +71,7 @@ do c) coverage="yes";; g) generate_tree_and_exit="yes" ;; i) interactive="yes";; - l) limit="$OPTARG";; + l) defaultLimit="$OPTARG";; s) use_sysv_ipc="yes";; *) fatal;; esac @@ -81,7 +81,7 @@ shiftcount=`expr $OPTIND - 1` shift $shiftcount if [ ${interactive} = "yes" ] ; then - limit=0 + defaultLimit=0 fi args=$* @@ -92,6 +92,7 @@ bspGeneratesDeviceTree="no" bspSupportsSystemVIPC="no" bspUsesGDBSimulator="yes" bspNeedsDos2Unix="no" +bspSimTrustedToExit="no" for v in 4.10 4.9 4.8 4.7 "" do @@ -197,9 +198,15 @@ runtest() echo run ${testname} for maximum ${max_run_time} seconds logfile=${testname}.tmp + + if [ ${bspSimTrustedToExit} = "yes" ] ; then + ${runBSP} `runARGS ${testname}` >${logfile} 2>&1 + catLog ${logfile} + rm -f ${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 @@ -213,6 +220,8 @@ runtest() running=$? if [ $running -eq 0 ] ; then if [ ${milliseconds} -ge ${millilimit} ]; then + kill -2 $pid 2> /dev/null + usleep 1000 kill -9 $pid 2> /dev/null catLog ${logfile} echo "${testname} killed after running ${max_run_time} seconds" @@ -228,10 +237,12 @@ runtest() checkGenericExits ${logfile} #>/dev/null 2>&1 genericExits=$? if [ ${bspFaults} -ne 0 -o ${genericExits} -ne 0 ] ; then + kill -2 $pid 2> /dev/null + usleep 1000 kill -9 ${pid} >/dev/null 2>&1 catLog ${logfile} echo Ran in ${milliseconds} milliseconds - break + break fi else # done normally @@ -241,6 +252,7 @@ runtest() fi done kill -9 $pid >/dev/null 2>&1 + rm ${logfile} } @@ -261,9 +273,11 @@ do *) testtype="single" ;; esac # calculate the limit in case it is used by the simulator script - if [ ${limit} = "not_set" ] ; then + if [ ${defaultLimit} = "not_set" ] ; then bspLimit ${toRun} limit=$? + else + limit=${defaultLimit} fi ## Some BSPs must generate device trees or scripts to provide to the simulator diff --git a/sim-scripts/skyeye-support b/sim-scripts/skyeye-support index 40f89ad..46547e0 100644 --- a/sim-scripts/skyeye-support +++ b/sim-scripts/skyeye-support @@ -6,8 +6,23 @@ bspUsesGDBSimulator="no" bspNeedsDos2Unix="yes" +if [ ${coverage} = "yes" ] ; then + bspRunFatal="yes" +fi runBSP=skyeye +bspLimit() +{ + tname=$1 + case ${tname} in + *stackchk*)limit=5 ;; + *fatal*) limit=1 ;; + *psxtime*) limit=180 ;; + *) limit=60 ;; + esac + return ${limit} +} + bspExited_ARM() { for pattern in \ diff --git a/sim-scripts/tsim-support b/sim-scripts/tsim-support index 5bd3c43..0c4df29 100644 --- a/sim-scripts/tsim-support +++ b/sim-scripts/tsim-support @@ -41,6 +41,7 @@ bspLimit() return ${limit} } +bspSimTrustedToExit="yes" bspGeneratesDeviceTree="yes" bspTreeFile=${tsimName}.conf @@ -56,6 +57,7 @@ bspGenerateDeviceTree() fi if [ ${coverage} = yes ] ; then echo "coverage save ${2}.cov" + echo "shell sleep 1" # give tsim time to actually write file fi echo "quit" |