deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support running multiple random seeds in case one fails

Browse source
This commit is contained in:
Moritz 'Morty' Strübe 2014-10-08 09:22:37 +02:00
parent c0783e2841
commit 74b741bad2
2 changed files with 68 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
regression-tests/Makefile.simulation-test
View file

@ -30,8 +30,8 @@ TESTS=$(wildcard ??-*.csc)
TESTLOGS=$(patsubst %.csc,%.testlog,$(TESTS))
LOGS=$(patsubst %.csc,%.log,$(TESTS))
FAILLOGS=$(patsubst %.csc,%.faillog,$(TESTS))
#Set random seed to create reproduceable results.
RANDOMSEED=1
#Set random seeds to create reproduceable results.
RANDOMSEED=1 5
CONTIKI=../..
@ -57,7 +57,7 @@ RUNALL=false
endif
%.testlog: %.csc cooja
@$(CONTIKI)/regression-tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" "$(RANDOMSEED)"
@$(CONTIKI)/regression-tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" $(RANDOMSEED)
clean:
@rm -f $(TESTLOGS) $(LOGS) $(FAILLOGS) COOJA.log COOJA.testlog \

66
regression-tests/simexec.sh
View file

@ -1,21 +1,31 @@
#!/bin/bash
# Do not return an error
RUNALL=$1
CSC=$2
CONTIKI=$3
BASENAME=$4
RANDOMSEED=$5
shift
# The simulation to run
CSC=$1
shift
#Contiki directory
CONTIKI=$1
shift
#The basename of the experiment
BASENAME=$1
shift
# The test will end on the first successfull run
#set -x
echo -n "Running test $BASENAME "
while (( "$#" )); do
RANDOMSEED=$1
echo -n "Running test $BASENAME with random Seed $RANDOMSEED: "
java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$CSC -contiki=$CONTIKI -random-seed=$RANDOMSEED > $BASENAME.log &
JPID=$!
java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$CSC -contiki=$CONTIKI -random-seed=$RANDOMSEED > $BASENAME.log &
JPID=$!
# Copy the log and only print "." if it changed
touch $BASENAME.log.prog
while kill -0 $JPID 2> /dev/null
do
# Copy the log and only print "." if it changed
touch $BASENAME.log.prog
while kill -0 $JPID 2> /dev/null
do
sleep 1
diff $BASENAME.log $BASENAME.log.prog > /dev/null
if [ $? -ne 0 ]
@ -23,35 +33,41 @@ do
echo -n "."
cp $BASENAME.log $BASENAME.log.prog
fi
done
rm $BASENAME.log.prog
done
rm $BASENAME.log.prog
wait $JPID
JRV=$?
wait $JPID
JRV=$?
if [ $JRV -eq 0 ] ; then
if [ $JRV -eq 0 ] ; then
touch COOJA.testlog;
mv COOJA.testlog $BASENAME.testlog
echo " OK"
exit 0
fi
fi
# In case of failure
# In case of failure
echo " FAIL ಠ_ಠ" | tee -a COOJA.testlog;
#Verbose output when using CI
if [ "$CI" = "true" ]; then
#Verbose output when using CI
if [ "$CI" = "true" ]; then
echo "==== COOJA.log ====" ; cat COOJA.log;
echo "==== COOJA.testlog ====" ; cat COOJA.testlog;
else
else
tail -50 COOJA.log ;
fi;
fi;
mv COOJA.testlog $BASENAME.faillog
mv COOJA.testlog $BASENAME.$RANDOMSEED.faillog
shift
done
#All seeds failed
echo " FAIL ಠ_ಠ" | tee -a $BASENAME.$RANDOMSEED.faillog;
# We do not want Make to stop -> Return 0
if [ "$RUNALL" = "true" ] ; then
@ -60,7 +76,7 @@ if [ "$RUNALL" = "true" ] ; then
exit 0
fi
#This is a failure
exit 1