From 49bf7626f1eea17fc7ebbc6a8426011d56e27fa6 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Sat, 9 Mar 2013 18:43:59 +0100 Subject: [PATCH 1/2] Split the collect test into collect and collect-lossy to make each individual travis build complete faster. Also changed the armgcc download link to a github location. --- .travis.yml | 3 ++- .../01-sky-shell-collect-lossy.csc} | 0 regression-tests/{09-ipv4 => 09-collect-lossy}/Makefile | 0 regression-tests/{10-ipv6 => 10-ipv4}/Makefile | 0 .../{09-ipv4 => 10-ipv4}/x01-ip-cooja-telnet-ping.csc | 0 .../{09-ipv4 => 10-ipv4}/x02-ip-sky-telnet-ping.csc | 0 .../{09-ipv4 => 10-ipv4}/x03-ip-sky-webserver-wget.csc | 0 regression-tests/{10-ipv6 => 11-ipv6}/01-cooja-ipv6-udp.csc | 0 regression-tests/{10-ipv6 => 11-ipv6}/02-sky-ipv6-udp.csc | 0 .../{10-ipv6 => 11-ipv6}/03-sky-ipv6-udp-fragmentation.csc | 0 .../{10-ipv6 => 11-ipv6}/04-sky-ipv6-rpl-collect.csc | 0 regression-tests/{11-rpl => 11-ipv6}/Makefile | 0 regression-tests/{11-rpl => 12-rpl}/01-rpl-up-route.csc | 0 regression-tests/{11-rpl => 12-rpl}/02-rpl-root-reboot.csc | 0 regression-tests/{11-rpl => 12-rpl}/03-rpl-28-hours.csc | 0 regression-tests/{11-rpl => 12-rpl}/04-rpl-large-network.csc | 0 regression-tests/{12-ipv6-apps => 12-rpl}/Makefile | 0 regression-tests/{11-rpl => 12-rpl}/code/Makefile | 0 regression-tests/{11-rpl => 12-rpl}/code/project-conf.h | 0 regression-tests/{11-rpl => 12-rpl}/code/receiver-node.c | 0 regression-tests/{11-rpl => 12-rpl}/code/root-node.c | 0 regression-tests/{11-rpl => 12-rpl}/code/sender-node.c | 0 .../{12-ipv6-apps => 13-ip6-apps}/01-sky-servreg-hack.csc | 0 regression-tests/13-ip6-apps/Makefile | 1 + .../{12-ipv6-apps => 13-ip6-apps}/rest_rpl_coap.js | 0 .../{12-ipv6-apps => 13-ip6-apps}/x02-sky-coap.csc | 0 26 files changed, 3 insertions(+), 1 deletion(-) rename regression-tests/{08-collect/02-sky-shell-collect-lossy.csc => 09-collect-lossy/01-sky-shell-collect-lossy.csc} (100%) rename regression-tests/{09-ipv4 => 09-collect-lossy}/Makefile (100%) rename regression-tests/{10-ipv6 => 10-ipv4}/Makefile (100%) rename regression-tests/{09-ipv4 => 10-ipv4}/x01-ip-cooja-telnet-ping.csc (100%) rename regression-tests/{09-ipv4 => 10-ipv4}/x02-ip-sky-telnet-ping.csc (100%) rename regression-tests/{09-ipv4 => 10-ipv4}/x03-ip-sky-webserver-wget.csc (100%) rename regression-tests/{10-ipv6 => 11-ipv6}/01-cooja-ipv6-udp.csc (100%) rename regression-tests/{10-ipv6 => 11-ipv6}/02-sky-ipv6-udp.csc (100%) rename regression-tests/{10-ipv6 => 11-ipv6}/03-sky-ipv6-udp-fragmentation.csc (100%) rename regression-tests/{10-ipv6 => 11-ipv6}/04-sky-ipv6-rpl-collect.csc (100%) rename regression-tests/{11-rpl => 11-ipv6}/Makefile (100%) rename regression-tests/{11-rpl => 12-rpl}/01-rpl-up-route.csc (100%) rename regression-tests/{11-rpl => 12-rpl}/02-rpl-root-reboot.csc (100%) rename regression-tests/{11-rpl => 12-rpl}/03-rpl-28-hours.csc (100%) rename regression-tests/{11-rpl => 12-rpl}/04-rpl-large-network.csc (100%) rename regression-tests/{12-ipv6-apps => 12-rpl}/Makefile (100%) rename regression-tests/{11-rpl => 12-rpl}/code/Makefile (100%) rename regression-tests/{11-rpl => 12-rpl}/code/project-conf.h (100%) rename regression-tests/{11-rpl => 12-rpl}/code/receiver-node.c (100%) rename regression-tests/{11-rpl => 12-rpl}/code/root-node.c (100%) rename regression-tests/{11-rpl => 12-rpl}/code/sender-node.c (100%) rename regression-tests/{12-ipv6-apps => 13-ip6-apps}/01-sky-servreg-hack.csc (100%) create mode 100644 regression-tests/13-ip6-apps/Makefile rename regression-tests/{12-ipv6-apps => 13-ip6-apps}/rest_rpl_coap.js (100%) rename regression-tests/{12-ipv6-apps => 13-ip6-apps}/x02-sky-coap.csc (100%) diff --git a/.travis.yml b/.travis.yml index d9becd8c3..4f89f07e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_script: - "sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 || true" ## Install toolchain for mc1233x in care-free way - "[ $BUILD_TYPE = compile ] && curl -s \ - https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2008q3-66-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 \ + http://adamdunkels.github.com/contiki-fork/arm-2008q3-66-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 \ | tar xjf - -C /tmp/ && sudo cp -f -r /tmp/arm-2008q3/* /usr/ && rm -rf /tmp/arm-2008q3 && arm-none-eabi-gcc --version || true" ## Install SDCC from a purpose-built bundle - "[ $BUILD_TYPE = compile ] && curl -s \ @@ -40,6 +40,7 @@ env: ## of environment variable defined below - BUILD_TYPE='compile' - BUILD_TYPE='collect' MAKE_TARGETS='cooja' + - BUILD_TYPE='collect-lossy' MAKE_TARGETS='cooja' - BUILD_TYPE='rpl' MAKE_TARGETS='cooja' - BUILD_TYPE='rime' MAKE_TARGETS='cooja' - BUILD_TYPE='ipv6' MAKE_TARGETS='cooja' diff --git a/regression-tests/08-collect/02-sky-shell-collect-lossy.csc b/regression-tests/09-collect-lossy/01-sky-shell-collect-lossy.csc similarity index 100% rename from regression-tests/08-collect/02-sky-shell-collect-lossy.csc rename to regression-tests/09-collect-lossy/01-sky-shell-collect-lossy.csc diff --git a/regression-tests/09-ipv4/Makefile b/regression-tests/09-collect-lossy/Makefile similarity index 100% rename from regression-tests/09-ipv4/Makefile rename to regression-tests/09-collect-lossy/Makefile diff --git a/regression-tests/10-ipv6/Makefile b/regression-tests/10-ipv4/Makefile similarity index 100% rename from regression-tests/10-ipv6/Makefile rename to regression-tests/10-ipv4/Makefile diff --git a/regression-tests/09-ipv4/x01-ip-cooja-telnet-ping.csc b/regression-tests/10-ipv4/x01-ip-cooja-telnet-ping.csc similarity index 100% rename from regression-tests/09-ipv4/x01-ip-cooja-telnet-ping.csc rename to regression-tests/10-ipv4/x01-ip-cooja-telnet-ping.csc diff --git a/regression-tests/09-ipv4/x02-ip-sky-telnet-ping.csc b/regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc similarity index 100% rename from regression-tests/09-ipv4/x02-ip-sky-telnet-ping.csc rename to regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc diff --git a/regression-tests/09-ipv4/x03-ip-sky-webserver-wget.csc b/regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc similarity index 100% rename from regression-tests/09-ipv4/x03-ip-sky-webserver-wget.csc rename to regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc diff --git a/regression-tests/10-ipv6/01-cooja-ipv6-udp.csc b/regression-tests/11-ipv6/01-cooja-ipv6-udp.csc similarity index 100% rename from regression-tests/10-ipv6/01-cooja-ipv6-udp.csc rename to regression-tests/11-ipv6/01-cooja-ipv6-udp.csc diff --git a/regression-tests/10-ipv6/02-sky-ipv6-udp.csc b/regression-tests/11-ipv6/02-sky-ipv6-udp.csc similarity index 100% rename from regression-tests/10-ipv6/02-sky-ipv6-udp.csc rename to regression-tests/11-ipv6/02-sky-ipv6-udp.csc diff --git a/regression-tests/10-ipv6/03-sky-ipv6-udp-fragmentation.csc b/regression-tests/11-ipv6/03-sky-ipv6-udp-fragmentation.csc similarity index 100% rename from regression-tests/10-ipv6/03-sky-ipv6-udp-fragmentation.csc rename to regression-tests/11-ipv6/03-sky-ipv6-udp-fragmentation.csc diff --git a/regression-tests/10-ipv6/04-sky-ipv6-rpl-collect.csc b/regression-tests/11-ipv6/04-sky-ipv6-rpl-collect.csc similarity index 100% rename from regression-tests/10-ipv6/04-sky-ipv6-rpl-collect.csc rename to regression-tests/11-ipv6/04-sky-ipv6-rpl-collect.csc diff --git a/regression-tests/11-rpl/Makefile b/regression-tests/11-ipv6/Makefile similarity index 100% rename from regression-tests/11-rpl/Makefile rename to regression-tests/11-ipv6/Makefile diff --git a/regression-tests/11-rpl/01-rpl-up-route.csc b/regression-tests/12-rpl/01-rpl-up-route.csc similarity index 100% rename from regression-tests/11-rpl/01-rpl-up-route.csc rename to regression-tests/12-rpl/01-rpl-up-route.csc diff --git a/regression-tests/11-rpl/02-rpl-root-reboot.csc b/regression-tests/12-rpl/02-rpl-root-reboot.csc similarity index 100% rename from regression-tests/11-rpl/02-rpl-root-reboot.csc rename to regression-tests/12-rpl/02-rpl-root-reboot.csc diff --git a/regression-tests/11-rpl/03-rpl-28-hours.csc b/regression-tests/12-rpl/03-rpl-28-hours.csc similarity index 100% rename from regression-tests/11-rpl/03-rpl-28-hours.csc rename to regression-tests/12-rpl/03-rpl-28-hours.csc diff --git a/regression-tests/11-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc similarity index 100% rename from regression-tests/11-rpl/04-rpl-large-network.csc rename to regression-tests/12-rpl/04-rpl-large-network.csc diff --git a/regression-tests/12-ipv6-apps/Makefile b/regression-tests/12-rpl/Makefile similarity index 100% rename from regression-tests/12-ipv6-apps/Makefile rename to regression-tests/12-rpl/Makefile diff --git a/regression-tests/11-rpl/code/Makefile b/regression-tests/12-rpl/code/Makefile similarity index 100% rename from regression-tests/11-rpl/code/Makefile rename to regression-tests/12-rpl/code/Makefile diff --git a/regression-tests/11-rpl/code/project-conf.h b/regression-tests/12-rpl/code/project-conf.h similarity index 100% rename from regression-tests/11-rpl/code/project-conf.h rename to regression-tests/12-rpl/code/project-conf.h diff --git a/regression-tests/11-rpl/code/receiver-node.c b/regression-tests/12-rpl/code/receiver-node.c similarity index 100% rename from regression-tests/11-rpl/code/receiver-node.c rename to regression-tests/12-rpl/code/receiver-node.c diff --git a/regression-tests/11-rpl/code/root-node.c b/regression-tests/12-rpl/code/root-node.c similarity index 100% rename from regression-tests/11-rpl/code/root-node.c rename to regression-tests/12-rpl/code/root-node.c diff --git a/regression-tests/11-rpl/code/sender-node.c b/regression-tests/12-rpl/code/sender-node.c similarity index 100% rename from regression-tests/11-rpl/code/sender-node.c rename to regression-tests/12-rpl/code/sender-node.c diff --git a/regression-tests/12-ipv6-apps/01-sky-servreg-hack.csc b/regression-tests/13-ip6-apps/01-sky-servreg-hack.csc similarity index 100% rename from regression-tests/12-ipv6-apps/01-sky-servreg-hack.csc rename to regression-tests/13-ip6-apps/01-sky-servreg-hack.csc diff --git a/regression-tests/13-ip6-apps/Makefile b/regression-tests/13-ip6-apps/Makefile new file mode 100644 index 000000000..272bc7da1 --- /dev/null +++ b/regression-tests/13-ip6-apps/Makefile @@ -0,0 +1 @@ +include ../Makefile.simulation-test diff --git a/regression-tests/12-ipv6-apps/rest_rpl_coap.js b/regression-tests/13-ip6-apps/rest_rpl_coap.js similarity index 100% rename from regression-tests/12-ipv6-apps/rest_rpl_coap.js rename to regression-tests/13-ip6-apps/rest_rpl_coap.js diff --git a/regression-tests/12-ipv6-apps/x02-sky-coap.csc b/regression-tests/13-ip6-apps/x02-sky-coap.csc similarity index 100% rename from regression-tests/12-ipv6-apps/x02-sky-coap.csc rename to regression-tests/13-ip6-apps/x02-sky-coap.csc From e9b13743839b2ec856581ba17a9de210e0cc814f Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Sun, 17 Mar 2013 10:39:13 +0100 Subject: [PATCH 2/2] Updated paths to relative paths to make it easier to move tests to new directories --- regression-tests/04-rime/09-cooja-trickle.csc | 2 +- regression-tests/04-rime/10-cooja-mesh.csc | 2 +- regression-tests/12-rpl/01-rpl-up-route.csc | 6 +++--- regression-tests/12-rpl/02-rpl-root-reboot.csc | 6 +++--- regression-tests/12-rpl/03-rpl-28-hours.csc | 6 +++--- regression-tests/12-rpl/04-rpl-large-network.csc | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/regression-tests/04-rime/09-cooja-trickle.csc b/regression-tests/04-rime/09-cooja-trickle.csc index 6311ff7dd..6010677f3 100644 --- a/regression-tests/04-rime/09-cooja-trickle.csc +++ b/regression-tests/04-rime/09-cooja-trickle.csc @@ -24,7 +24,7 @@ se.sics.cooja.contikimote.ContikiMoteType mtype346 Cooja Mote Type #1 - [CONTIKI_DIR]/regression-tests/04-rime/code/trickle-node.c + [CONFIG_DIR]/code/trickle-node.c make trickle-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.Battery diff --git a/regression-tests/04-rime/10-cooja-mesh.csc b/regression-tests/04-rime/10-cooja-mesh.csc index 1939f1757..a85ef79f4 100644 --- a/regression-tests/04-rime/10-cooja-mesh.csc +++ b/regression-tests/04-rime/10-cooja-mesh.csc @@ -24,7 +24,7 @@ se.sics.cooja.contikimote.ContikiMoteType mtype140 Cooja Mote Type #1 - [CONTIKI_DIR]/regression-tests/04-rime/code/mesh-node.c + [CONFIG_DIR]/code/mesh-node.c make mesh-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.Battery diff --git a/regression-tests/12-rpl/01-rpl-up-route.csc b/regression-tests/12-rpl/01-rpl-up-route.csc index 5d84b5f67..5430242f4 100644 --- a/regression-tests/12-rpl/01-rpl-up-route.csc +++ b/regression-tests/12-rpl/01-rpl-up-route.csc @@ -24,7 +24,7 @@ se.sics.cooja.contikimote.ContikiMoteType mtype456 Sender - [CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c + [CONFIG_DIR]/code/sender-node.c make TARGET=cooja clean make sender-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype452 RPL root - [CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c + [CONFIG_DIR]/code/root-node.c make TARGET=cooja clean make root-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype904 Receiver - [CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c + [CONFIG_DIR]/code/receiver-node.c make TARGET=cooja clean make receiver-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position diff --git a/regression-tests/12-rpl/02-rpl-root-reboot.csc b/regression-tests/12-rpl/02-rpl-root-reboot.csc index 25888606f..c623b0322 100644 --- a/regression-tests/12-rpl/02-rpl-root-reboot.csc +++ b/regression-tests/12-rpl/02-rpl-root-reboot.csc @@ -24,7 +24,7 @@ se.sics.cooja.contikimote.ContikiMoteType mtype748 Sender - [CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c + [CONFIG_DIR]/code/sender-node.c make TARGET=cooja clean make sender-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype442 RPL root - [CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c + [CONFIG_DIR]/code/root-node.c make TARGET=cooja clean make root-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype236 Receiver - [CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c + [CONFIG_DIR]/code/receiver-node.c make TARGET=cooja clean make receiver-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position diff --git a/regression-tests/12-rpl/03-rpl-28-hours.csc b/regression-tests/12-rpl/03-rpl-28-hours.csc index 80e9c7996..69d4f2f4f 100644 --- a/regression-tests/12-rpl/03-rpl-28-hours.csc +++ b/regression-tests/12-rpl/03-rpl-28-hours.csc @@ -24,7 +24,7 @@ se.sics.cooja.contikimote.ContikiMoteType mtype391 Sender - [CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c + [CONFIG_DIR]/code/sender-node.c make TARGET=cooja clean make sender-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype250 RPL root - [CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c + [CONFIG_DIR]/code/root-node.c make TARGET=cooja clean make root-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype822 Receiver - [CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c + [CONFIG_DIR]/code/receiver-node.c make TARGET=cooja clean make receiver-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc index 1bbc01225..8deb2e6a0 100644 --- a/regression-tests/12-rpl/04-rpl-large-network.csc +++ b/regression-tests/12-rpl/04-rpl-large-network.csc @@ -24,7 +24,7 @@ se.sics.cooja.contikimote.ContikiMoteType mtype456 Sender - [CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c + [CONFIG_DIR]/code/sender-node.c make TARGET=cooja clean make sender-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype452 RPL root - [CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c + [CONFIG_DIR]/code/root-node.c make TARGET=cooja clean make root-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position @@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja se.sics.cooja.contikimote.ContikiMoteType mtype904 Receiver - [CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c + [CONFIG_DIR]/code/receiver-node.c make TARGET=cooja clean make receiver-node.cooja TARGET=cooja se.sics.cooja.interfaces.Position