CI: rework simulation test

This commit is contained in:
Simon Duquennoy 2017-11-16 06:34:49 -08:00
parent 7c8feecb11
commit 59c7f356fd
2 changed files with 7 additions and 11 deletions

View File

@ -25,6 +25,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
all: cooja summary
TESTS=$(wildcard ??-*.csc)
TESTLOGS=$(sort $(patsubst %.csc,%.testlog,$(TESTS)))
@ -40,12 +41,12 @@ tests: $(TESTLOGS)
summary: clean tests
ifeq ($(TESTS),)
@echo No tests > $@
@echo No tests > summary
else
@cat $(TESTLOGS) > $@
@cat $(TESTLOGS) > summary
endif
all: cooja clean tests
@echo "========== Summary =========="
@cat summary
%.testlog: %.csc cooja
@$(CONTIKI)/tests/simexec.sh "$<" "$(CONTIKI)" "$(basename $@)" $(BASESEED) $(RUNCOUNT)

View File

@ -61,13 +61,8 @@ for (( SEED=$BASESEED; SEED<$(($BASESEED+$RUNCOUNT)); SEED++ )); do
else
FAILSEEDS+=" $BASESEED"
echo " FAIL"
# Verbose output when using CI
if [ "$CI" = "true" ]; then
echo "==== $BASENAME.$SEED.coojalog ====" ; cat $BASENAME.$SEED.coojalog;
echo "==== $BASENAME.$SEED.scriptlog ====" ; cat $BASENAME.$SEED.scriptlog;
else
echo "==== Check $BASENAME.$SEED.coojalog and $BASENAME.$SEED.scriptlog for details ====";
fi
echo "==== $BASENAME.$SEED.coojalog ====" ; cat $BASENAME.$SEED.coojalog;
echo "==== $BASENAME.$SEED.scriptlog ====" ; cat $BASENAME.$SEED.scriptlog;
fi
done