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

Merge pull request #821 from cmorty/pull/ci_debug

Browse source 
Make reproducing result from the CI easier
This commit is contained in:
Fredrik Österlind 2014-11-13 10:23:22 +01:00
parent a488ac16cc 6670b27320
commit bfc217fbd0
4 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -5,6 +5,9 @@ before_script:
- WGET="travis_retry wget --continue --tries=20 --waitretry=10 --retry-connrefused --no-dns-cache --timeout 300" - WGET="travis_retry wget --continue --tries=20 --waitretry=10 --retry-connrefused --no-dns-cache --timeout 300"
- sudo apt-get -qq update - sudo apt-get -qq update
## Support building a binary that is identical to the CI
- echo -n "Contiki will be compiled with RELSTR=" ; git --git-dir .git describe --tags --always
## Install msp430 toolchain ## Install msp430 toolchain
- sudo apt-get -qq install lib32z1 - sudo apt-get -qq install lib32z1
- $WGET http://adamdunkels.github.io/contiki-fork/mspgcc-4.7.0-compiled.tar.bz2 && - $WGET http://adamdunkels.github.io/contiki-fork/mspgcc-4.7.0-compiled.tar.bz2 &&

13
Makefile.include
View file

@ -35,6 +35,13 @@ ifndef HOST_OS
endif endif
endif endif
#More debug information when running in CI
ifdef CI
ifeq ($(CI),true)
V = 1
endif
endif
usage: usage:
@echo "make MAKETARGETS... [TARGET=(TARGET)] [savetarget] [targets]" @echo "make MAKETARGETS... [TARGET=(TARGET)] [savetarget] [targets]"
@ -152,8 +159,10 @@ CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
### Check for a git repo and pass version if found ### Check for a git repo and pass version if found
### git.exe in Windows cmd shells may require no stderr redirection ### git.exe in Windows cmd shells may require no stderr redirection
#RELSTR=${shell git describe --tags} ifndef RELSTR
RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags 2>/dev/null} RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags --always}
endif
ifneq ($(RELSTR),) ifneq ($(RELSTR),)
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\" CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\"
endif endif

15
regression-tests/simexec.sh
View file

@ -54,12 +54,15 @@ while (( "$#" )); do
#Verbose output when using CI #Verbose output when using CI
if [ "$CI" = "true" ]; then if [ "$CI" = "true" ]; then
echo "==== COOJA.log ====" ; cat COOJA.log; echo "==== COOJA.log ====" ; cat COOJA.log;
echo "==== COOJA.testlog ====" ; cat COOJA.testlog; echo "==== COOJA.testlog ====" ; cat COOJA.testlog;
else echo "==== Files used for simulation (sha1sum) ===="
tail -50 COOJA.log ; grep "Loading firmware from:" COOJA.log | cut -d " " -f 10 | uniq | xargs -r sha1sum
fi; grep "Creating core communicator between Java class" COOJA.log | cut -d " " -f 17 | uniq | xargs -r sha1sum
else
tail -50 COOJA.log ;
fi;
mv COOJA.testlog $BASENAME.$RANDOMSEED.faillog mv COOJA.testlog $BASENAME.$RANDOMSEED.faillog

2
tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
View file

@ -403,7 +403,7 @@ public class ContikiMoteType implements MoteType {
} }
// Allocate core communicator class // Allocate core communicator class
logger.info("Creating core communicator between Java class '" + javaClassName + "' and Contiki library '" + getContikiFirmwareFile().getName() + "'"); logger.info("Creating core communicator between Java class " + javaClassName + " and Contiki library '" + getContikiFirmwareFile().getPath() + "");
myCoreComm = CoreComm.createCoreComm(this.javaClassName, getContikiFirmwareFile()); myCoreComm = CoreComm.createCoreComm(this.javaClassName, getContikiFirmwareFile());
/* Parse addresses using map file /* Parse addresses using map file