From bbb4dde8ac1b0776a388ba5f8b24a903833adcae Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Tue, 11 Dec 2012 12:57:38 -0500 Subject: [PATCH 1/3] ignore generated files from regresstion tests and more platforms --- .gitignore | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d7c8cfe15..88efbfdea 100644 --- a/.gitignore +++ b/.gitignore @@ -7,10 +7,21 @@ *.d *.ihex *.pyc -*.sky *.redbee-econotag *.econotag *.native +*.z1 +*.minimal-net +*.sky +*.wismote +*.esb +*.avr-raven +*.exp5438 +*.mb851 +*.report +summary +*.summary +*.faillog obj_* symbols.* Makefile.target From 9f297cdd4e87bab5bba0db8d9df2f4b44db267f9 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Tue, 11 Dec 2012 12:58:11 -0500 Subject: [PATCH 2/3] Fix up compile test so that you can do nested subdirectories --- regression-tests/Makefile.compile-test | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/regression-tests/Makefile.compile-test b/regression-tests/Makefile.compile-test index 320127e24..7b29787dd 100644 --- a/regression-tests/Makefile.compile-test +++ b/regression-tests/Makefile.compile-test @@ -29,9 +29,6 @@ all: summary 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 # give each compile test a number, prefixed with a 0 if the number is # < 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})) define dooneexample -@echo Buildling example $(3): $(1) for target $(2) +@echo Building example $(3): $(1) for target $(2) @((cd $(EXAMPLESDIR)/$(1); \ make TARGET=$(2) clean && make TARGET=$(2)) > \ - $(3)-$(1)-$(2).report 2>&1 && \ - (echo $(1) $(2): OK | tee $(3)-$(1)-$(2).summary) || \ - (echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(1)-$(2).summary ; \ - tail -10 $(3)-$(1)-$(2).report > $(3)-$(1)-$(2).faillog)) + $(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 ; \ + tail -10 $(3)-$(subst /,-,$(1))$(2).report > $(3)-$(subst /,-,$(1))$(2).faillog)) endef define doexample $(eval i+=x) -$(call dooneexample,$(call dirnam,${1}),$(call target,${1}),$(call addzero,${i})) +$(call dooneexample,$(dir ${1}),$(notdir ${1}),$(call addzero,${i})) endef #end of GNU make magic From 911bdd1b77873f932d7c5b91be2b4429ce5e9d27 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Tue, 11 Dec 2012 12:58:49 -0500 Subject: [PATCH 3/3] add a few important econotag compile tests --- regression-tests/01-compile/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/regression-tests/01-compile/Makefile b/regression-tests/01-compile/Makefile index f30fa29b6..2a6bceb2d 100644 --- a/regression-tests/01-compile/Makefile +++ b/regression-tests/01-compile/Makefile @@ -13,8 +13,10 @@ hello-world/native \ hello-world/sky \ hello-world/wismote \ hello-world/z1 \ +ipv6/rpl-border-router/econotag \ collect/sky \ er-rest-example/sky \ +er-rest-example/econotag \ example-shell/native \ netperf/sky \ powertrace/sky \ @@ -30,6 +32,7 @@ sky-shell-webserver/sky \ telnet-server/minimal-net \ webserver/minimal-net \ webserver-ipv6/sky \ +webserver-ipv6/econotag \ wget/minimal-net \ z1/z1