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

Merge pull request #57 from malvira/rtest-fixes

Browse source 
Some fixes to compile-tests
This commit is contained in:
Adam Dunkels 2012-12-11 10:45:04 -08:00
parent ab4d2ecddd 911bdd1b77
commit f44068bf9a
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.gitignore vendored
View file

@ -7,10 +7,21 @@
*.d *.d
*.ihex *.ihex
*.pyc *.pyc
*.sky
*.redbee-econotag *.redbee-econotag
*.econotag *.econotag
*.native *.native
*.z1
*.minimal-net
*.sky
*.wismote
*.esb
*.avr-raven
*.exp5438
*.mb851
*.report
summary
*.summary
*.faillog
obj_* obj_*
symbols.* symbols.*
Makefile.target Makefile.target

3
regression-tests/01-compile/Makefile
View file

@ -13,8 +13,10 @@ hello-world/native \
hello-world/sky \ hello-world/sky \
hello-world/wismote \ hello-world/wismote \
hello-world/z1 \ hello-world/z1 \
ipv6/rpl-border-router/econotag \
collect/sky \ collect/sky \
er-rest-example/sky \ er-rest-example/sky \
er-rest-example/econotag \
example-shell/native \ example-shell/native \
netperf/sky \ netperf/sky \
powertrace/sky \ powertrace/sky \
@ -30,6 +32,7 @@ sky-shell-webserver/sky \
telnet-server/minimal-net \ telnet-server/minimal-net \
webserver/minimal-net \ webserver/minimal-net \
webserver-ipv6/sky \ webserver-ipv6/sky \
webserver-ipv6/econotag \
wget/minimal-net \ wget/minimal-net \
z1/z1 z1/z1

15
regression-tests/Makefile.compile-test
View file

@ -29,9 +29,6 @@ all: summary
build: examples tools build: examples tools
dirnam = $(word 1, $(subst /, ,${1}))
target = $(word 2, $(subst /, ,${1}))
# The stuff below is some GNU make magic to automatically make make # The stuff below is some GNU make magic to automatically make make
# give each compile test a number, prefixed with a 0 if the number is # give each compile test a number, prefixed with a 0 if the number is
# < 10, to match the way the simulation tests output works. # < 10, to match the way the simulation tests output works.
@ -41,18 +38,18 @@ gt = $(filter-out $(words ${1}),$(words $(call max,${1},${2})))
addzero = $(if $(call gt,${nine},$(1)),$(words ${1}),0$(words ${1})) addzero = $(if $(call gt,${nine},$(1)),$(words ${1}),0$(words ${1}))
define dooneexample define dooneexample
@echo Buildling example $(3): $(1) for target $(2) @echo Building example $(3): $(1) for target $(2)
@((cd $(EXAMPLESDIR)/$(1); \ @((cd $(EXAMPLESDIR)/$(1); \
make TARGET=$(2) clean && make TARGET=$(2)) > \ make TARGET=$(2) clean && make TARGET=$(2)) > \
$(3)-$(1)-$(2).report 2>&1 && \ $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
(echo $(1) $(2): OK | tee $(3)-$(1)-$(2).summary) || \ (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \
(echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(1)-$(2).summary ; \ (echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \
tail -10 $(3)-$(1)-$(2).report > $(3)-$(1)-$(2).faillog)) tail -10 $(3)-$(subst /,-,$(1))$(2).report > $(3)-$(subst /,-,$(1))$(2).faillog))
endef endef
define doexample define doexample
$(eval i+=x) $(eval i+=x)
$(call dooneexample,$(call dirnam,${1}),$(call target,${1}),$(call addzero,${i})) $(call dooneexample,$(dir ${1}),$(notdir ${1}),$(call addzero,${i}))
endef endef
#end of GNU make magic #end of GNU make magic