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

[ci] Provide the mechanism to exclude/mark Cooja tests

Browse source
This commit is contained in:
Ilya Dmitrichenko 2012-11-16 10:51:01 +00:00
parent ab9aca3e10
commit 0c316c8d15
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.mk
View file

@ -50,7 +50,12 @@ EXCLUDE_avr_raven = ipv6/rpl-collect
EXAMPLES_sky = $(EXAMPLES_most_non_native) sky-shell EXAMPLES_sky = $(EXAMPLES_most_non_native) sky-shell
COOJA_TESTS = tools/cooja/contiki_tests/*.csc COOJA_TESTS_DIR = tools/cooja/contiki_tests
COOJA_TESTS_ALL = $(COOJA_TESTS_DIR)/*.csc
## Some Cooja tests can also be excluded:
EXCLUDE_COOJA_TESTS = servreg-hack.csc sky_coffee.csc rime_collect.csc rime_trickle.csc
## And some can also be marked:
MARK_COOJA_TESTS = crosslevel.csc ip_sky_telnet_ping.csc
CT := \033[0;0m CT := \033[0;0m
@ -78,8 +83,9 @@ endif
ifeq ($(BUILD_TYPE),cooja) ifeq ($(BUILD_TYPE),cooja)
JAVA = java -mx512m JAVA = java -mx512m
THIS = $(SHELL) -c "cd `dirname $$e` && $(JAVA) -jar ../dist/cooja.jar -nogui=`basename $$e`" > $(LOG) 2>&1 THIS = $(SHELL) -x -c "cd `dirname $$e` && $(JAVA) -jar ../dist/cooja.jar -nogui=`basename $$e`" > $(LOG) #2>&1
MINE = $(COOJA_TESTS) MINE = $(filter-out $(addprefix $(COOJA_TESTS_DIR)/, $(EXCLUDE_COOJA_TESTS)), $(wildcard $(COOJA_TESTS_ALL)))
SKIP_LIST = $(addprefix $(COOJA_TESTS_DIR)/, $(MARK_COOJA_TESTS))
endif endif
LOG = /tmp/$@_`echo $$e | sed 's:/:_:g'`.log LOG = /tmp/$@_`echo $$e | sed 's:/:_:g'`.log