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

Merge remote-tracking branch 'upstream/master' into stm32nucleo-spirit1

Browse source
This commit is contained in:
Marco Grella 2015-11-25 12:36:01 +01:00
commit e47c69c170
144 changed files with 3942 additions and 2352 deletions
Download patch file Download diff file Expand all files Collapse all files

2
regression-tests/01-compile-base/Makefile
View file

@ -31,7 +31,7 @@ telnet-server/minimal-net \
webserver/minimal-net \
webserver-ipv6/eval-adf7xxxmb4z \
wget/minimal-net \
z1/z1 \
zolertia/z1/z1 \
settings-example/avr-raven \
ipv6/multicast/sky \

2
regression-tests/15-compile-arm-apcs-ports/Makefile
View file

@ -3,7 +3,7 @@ TOOLSDIR=../../tools
EXAMPLES = \
hello-world/econotag \
hello-world/mbxxx \
hello-world/mbxxx:STM32W_CPUREV=CC \
ipv6/rpl-border-router/econotag \
er-rest-example/econotag \
webserver-ipv6/econotag \

2
regression-tests/16-compile-6502-ports/Makefile
View file

@ -7,7 +7,7 @@ irc-80col/c64 \
telnet-server/c64 \
webbrowser/c64 \
webbrowser-80col/c64 \
webserver/c64 \
webserver/c64:HTTPD-CFS=1 \
wget/c64 \
telnet-server/apple2enh \
telnet-server/atarixl \

5
regression-tests/18-compile-arm-ports/Makefile
View file

@ -18,6 +18,11 @@ cc2538dk/udp-ipv6-echo-server/cc2538dk \
cc2538dk/sniffer/cc2538dk \
cc2538dk/mqtt-demo/cc2538dk \
ipv6/multicast/cc2538dk \
zolertia/zoul/zoul \
zolertia/zoul/cc1200-demo/zoul \
er-rest-example/zoul \
hello-world/zoul \
cc2538dk/mqtt-demo/zoul \
er-rest-example/stm32nucleo-spirit1 \
ipv6/rpl-border-router/stm32nucleo-spirit1 \
ipv6/rpl-udp/stm32nucleo-spirit1 \

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

@ -36,12 +36,13 @@ nine := x x x x x x x x x
max = $(subst xx,x,$(join ${1},${2}))
gt = $(filter-out $(words ${1}),$(words $(call max,${1},${2})))
addzero = $(if $(call gt,${nine},$(1)),$(words ${1}),0$(words ${1}))
get_target = $(firstword $(subst :, ,$1))
get_target_vars = $(wordlist 2,15,$(subst :, ,$1))
define dooneexample
@echo Building example $(3): $(1) for target $(2)
@echo Building example $(3): $(1) $(4) for target $(2)
@((cd $(EXAMPLESDIR)/$(1); \
export STM32W_CPUREV=CC; \
make TARGET=$(2) clean && make TARGET=$(2) WERROR=1) > \
make $(4) TARGET=$(2) clean && make $(4) TARGET=$(2) WERROR=1) > \
$(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
(echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \
(echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \
@ -50,7 +51,7 @@ endef
define doexample
$(eval i+=x)
$(call dooneexample,$(dir ${1}),$(notdir ${1}),$(call addzero,${i}))
$(call dooneexample,$(dir $(call get_target,${1})),$(notdir $(call get_target,${1})),$(call addzero,${i}),$(call get_target_vars,${1}))
endef
#end of GNU make magic