Merge pull request #810 from cmorty/pull/sky_energest
sky: Initialize energest as early as possible / make regression testing more tolerant
This commit is contained in:
Fredrik Österlind
commit
7c55290c32
|
|
@ -78,7 +78,7 @@ after_script:
|
|||
- "[ ${BUILD_CATEGORY:-sim} = sim ] && tail regression-tests/??-$BUILD_TYPE/*.testlog"
|
||||
## Print a basic summary
|
||||
- "echo 'Summary:'; cat regression-tests/??-$BUILD_TYPE/summary"
|
||||
- "FAILS=`grep -c -i 'fail' regression-tests/??-$BUILD_TYPE/summary`"
|
||||
- "FAILS=`grep -c ' FAIL ' regression-tests/??-$BUILD_TYPE/summary`"
|
||||
## This will detect whether the build should pass or fail
|
||||
- "test $FAILS -eq 0; exit $?"
|
||||
|
||||
|
|
|
|||
|
|
@ -283,6 +283,10 @@ main(int argc, char **argv)
|
|||
* Hardware initialization done!
|
||||
*/
|
||||
|
||||
/* Initialize energest first (but after rtimer)
|
||||
*/
|
||||
energest_init();
|
||||
ENERGEST_ON(ENERGEST_TYPE_CPU);
|
||||
|
||||
#if WITH_TINYOS_AUTO_IDS
|
||||
node_id = TOS_NODE_ID;
|
||||
|
|
@ -418,9 +422,6 @@ main(int argc, char **argv)
|
|||
}
|
||||
#endif /* WITH_UIP */
|
||||
|
||||
energest_init();
|
||||
ENERGEST_ON(ENERGEST_TYPE_CPU);
|
||||
|
||||
watchdog_start();
|
||||
|
||||
NETSTACK_LLSEC.bootstrap(start_network_layer);
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -1,66 +1,82 @@
|
|||
#!/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
|
||||
sleep 1
|
||||
diff $BASENAME.log $BASENAME.log.prog > /dev/null
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo -n "."
|
||||
cp $BASENAME.log $BASENAME.log.prog
|
||||
fi
|
||||
# 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 ]
|
||||
then
|
||||
echo -n "."
|
||||
cp $BASENAME.log $BASENAME.log.prog
|
||||
fi
|
||||
done
|
||||
rm $BASENAME.log.prog
|
||||
|
||||
|
||||
wait $JPID
|
||||
JRV=$?
|
||||
|
||||
if [ $JRV -eq 0 ] ; then
|
||||
touch COOJA.testlog;
|
||||
mv COOJA.testlog $BASENAME.testlog
|
||||
echo " OK"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# In case of failure
|
||||
|
||||
|
||||
|
||||
#Verbose output when using CI
|
||||
if [ "$CI" = "true" ]; then
|
||||
echo "==== COOJA.log ====" ; cat COOJA.log;
|
||||
echo "==== COOJA.testlog ====" ; cat COOJA.testlog;
|
||||
else
|
||||
tail -50 COOJA.log ;
|
||||
fi;
|
||||
|
||||
mv COOJA.testlog $BASENAME.$RANDOMSEED.faillog
|
||||
|
||||
shift
|
||||
done
|
||||
rm $BASENAME.log.prog
|
||||
|
||||
|
||||
wait $JPID
|
||||
JRV=$?
|
||||
|
||||
if [ $JRV -eq 0 ] ; then
|
||||
touch COOJA.testlog;
|
||||
mv COOJA.testlog $BASENAME.testlog
|
||||
echo " OK"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# In case of failure
|
||||
|
||||
echo " FAIL ಠ_ಠ" | tee -a COOJA.testlog;
|
||||
|
||||
#Verbose output when using CI
|
||||
if [ "$CI" = "true" ]; then
|
||||
echo "==== COOJA.log ====" ; cat COOJA.log;
|
||||
echo "==== COOJA.testlog ====" ; cat COOJA.testlog;
|
||||
else
|
||||
tail -50 COOJA.log ;
|
||||
fi;
|
||||
|
||||
mv COOJA.testlog $BASENAME.faillog
|
||||
#All seeds failed
|
||||
echo " FAIL ಠ_ಠ" | tee -a $BASENAME.$RANDOMSEED.faillog;
|
||||
|
||||
# We do not want Make to stop -> Return 0
|
||||
if [ "$RUNALL" = "true" ] ; then
|
||||
touch COOJA.testlog;
|
||||
mv COOJA.testlog $BASENAME.testlog;
|
||||
exit 0
|
||||
touch COOJA.testlog;
|
||||
mv COOJA.testlog $BASENAME.testlog;
|
||||
exit 0
|
||||
fi
|
||||
|
||||
#This is a failure
|
||||
|
||||
exit 1
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue