Merge pull request contiki-os#172 from adamdunkels/feature-split-coll…

…ect-regression-test Regression tests: split the collect test into two, moved armgcc download location
andresv · Mar 18, 2013 · adf401b · adf401b
2 parents f81e407 + e9b1374
commit adf401b
Show file tree

Hide file tree

Showing 28 changed files with 17 additions and 15 deletions.
diff --git 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/04-rime/09-cooja-trickle.csc b/regression-tests/04-rime/09-cooja-trickle.csc
@@ -24,7 +24,7 @@
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype346</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/regression-tests/04-rime/code/trickle-node.c</source>
+      <source>[CONFIG_DIR]/code/trickle-node.c</source>
       <commands>make trickle-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>

diff --git 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
       <identifier>mtype140</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/regression-tests/04-rime/code/mesh-node.c</source>
+      <source>[CONFIG_DIR]/code/mesh-node.c</source>
       <commands>make mesh-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>

diff --git a/...08-collect/02-sky-shell-collect-lossy.csc → ...lect-lossy/01-sky-shell-collect-lossy.csc b/...08-collect/02-sky-shell-collect-lossy.csc → ...lect-lossy/01-sky-shell-collect-lossy.csc
diff --git a/regression-tests/09-ipv4/Makefile → regression-tests/09-collect-lossy/Makefile b/regression-tests/09-ipv4/Makefile → regression-tests/09-collect-lossy/Makefile
diff --git a/regression-tests/10-ipv6/Makefile → regression-tests/10-ipv4/Makefile b/regression-tests/10-ipv6/Makefile → regression-tests/10-ipv4/Makefile
diff --git a/...ests/09-ipv4/x01-ip-cooja-telnet-ping.csc → ...ests/10-ipv4/x01-ip-cooja-telnet-ping.csc b/...ests/09-ipv4/x01-ip-cooja-telnet-ping.csc → ...ests/10-ipv4/x01-ip-cooja-telnet-ping.csc
diff --git a/...-tests/09-ipv4/x02-ip-sky-telnet-ping.csc → ...-tests/10-ipv4/x02-ip-sky-telnet-ping.csc b/...-tests/09-ipv4/x02-ip-sky-telnet-ping.csc → ...-tests/10-ipv4/x02-ip-sky-telnet-ping.csc
diff --git a/...sts/09-ipv4/x03-ip-sky-webserver-wget.csc → ...sts/10-ipv4/x03-ip-sky-webserver-wget.csc b/...sts/09-ipv4/x03-ip-sky-webserver-wget.csc → ...sts/10-ipv4/x03-ip-sky-webserver-wget.csc
diff --git a/...ssion-tests/10-ipv6/01-cooja-ipv6-udp.csc → ...ssion-tests/11-ipv6/01-cooja-ipv6-udp.csc b/...ssion-tests/10-ipv6/01-cooja-ipv6-udp.csc → ...ssion-tests/11-ipv6/01-cooja-ipv6-udp.csc
diff --git a/regression-tests/10-ipv6/02-sky-ipv6-udp.csc → regression-tests/11-ipv6/02-sky-ipv6-udp.csc b/regression-tests/10-ipv6/02-sky-ipv6-udp.csc → regression-tests/11-ipv6/02-sky-ipv6-udp.csc
diff --git a/...10-ipv6/03-sky-ipv6-udp-fragmentation.csc → ...11-ipv6/03-sky-ipv6-udp-fragmentation.csc b/...10-ipv6/03-sky-ipv6-udp-fragmentation.csc → ...11-ipv6/03-sky-ipv6-udp-fragmentation.csc
diff --git a/...tests/10-ipv6/04-sky-ipv6-rpl-collect.csc → ...tests/11-ipv6/04-sky-ipv6-rpl-collect.csc b/...tests/10-ipv6/04-sky-ipv6-rpl-collect.csc → ...tests/11-ipv6/04-sky-ipv6-rpl-collect.csc
diff --git a/regression-tests/11-rpl/Makefile → regression-tests/11-ipv6/Makefile b/regression-tests/11-rpl/Makefile → regression-tests/11-ipv6/Makefile
diff --git a/regression-tests/11-rpl/01-rpl-up-route.csc → regression-tests/12-rpl/01-rpl-up-route.csc b/regression-tests/11-rpl/01-rpl-up-route.csc → regression-tests/12-rpl/01-rpl-up-route.csc
@@ -24,7 +24,7 @@
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype456</identifier>
       <description>Sender</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c</source>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
       <commands>make TARGET=cooja clean
 make sender-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype452</identifier>
       <description>RPL root</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c</source>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
       <commands>make TARGET=cooja clean
 make root-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype904</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c</source>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
       <commands>make TARGET=cooja clean
 make receiver-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

diff --git a/...ssion-tests/11-rpl/02-rpl-root-reboot.csc → ...ssion-tests/12-rpl/02-rpl-root-reboot.csc b/...ssion-tests/11-rpl/02-rpl-root-reboot.csc → ...ssion-tests/12-rpl/02-rpl-root-reboot.csc
@@ -24,7 +24,7 @@
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype748</identifier>
       <description>Sender</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c</source>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
       <commands>make TARGET=cooja clean
 make sender-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype442</identifier>
       <description>RPL root</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c</source>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
       <commands>make TARGET=cooja clean
 make root-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype236</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c</source>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
       <commands>make TARGET=cooja clean
 make receiver-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

diff --git a/regression-tests/11-rpl/03-rpl-28-hours.csc → regression-tests/12-rpl/03-rpl-28-hours.csc b/regression-tests/11-rpl/03-rpl-28-hours.csc → regression-tests/12-rpl/03-rpl-28-hours.csc
@@ -24,7 +24,7 @@
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype391</identifier>
       <description>Sender</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c</source>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
       <commands>make TARGET=cooja clean
 make sender-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype250</identifier>
       <description>RPL root</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c</source>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
       <commands>make TARGET=cooja clean
 make root-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype822</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c</source>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
       <commands>make TARGET=cooja clean
 make receiver-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

diff --git a/...ion-tests/11-rpl/04-rpl-large-network.csc → ...ion-tests/12-rpl/04-rpl-large-network.csc b/...ion-tests/11-rpl/04-rpl-large-network.csc → ...ion-tests/12-rpl/04-rpl-large-network.csc
@@ -24,7 +24,7 @@
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype456</identifier>
       <description>Sender</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/sender-node.c</source>
+      <source>[CONFIG_DIR]/code/sender-node.c</source>
       <commands>make TARGET=cooja clean
 make sender-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype452</identifier>
       <description>RPL root</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/root-node.c</source>
+      <source>[CONFIG_DIR]/code/root-node.c</source>
       <commands>make TARGET=cooja clean
 make root-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
       se.sics.cooja.contikimote.ContikiMoteType
       <identifier>mtype904</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/regression-tests/11-rpl/code/receiver-node.c</source>
+      <source>[CONFIG_DIR]/code/receiver-node.c</source>
       <commands>make TARGET=cooja clean
 make receiver-node.cooja TARGET=cooja</commands>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

diff --git a/regression-tests/12-ipv6-apps/Makefile → regression-tests/12-rpl/Makefile b/regression-tests/12-ipv6-apps/Makefile → regression-tests/12-rpl/Makefile
diff --git a/regression-tests/11-rpl/code/Makefile → regression-tests/12-rpl/code/Makefile b/regression-tests/11-rpl/code/Makefile → regression-tests/12-rpl/code/Makefile
diff --git a/regression-tests/11-rpl/code/project-conf.h → regression-tests/12-rpl/code/project-conf.h b/regression-tests/11-rpl/code/project-conf.h → regression-tests/12-rpl/code/project-conf.h
diff --git a/regression-tests/11-rpl/code/receiver-node.c → regression-tests/12-rpl/code/receiver-node.c b/regression-tests/11-rpl/code/receiver-node.c → regression-tests/12-rpl/code/receiver-node.c
diff --git a/regression-tests/11-rpl/code/root-node.c → regression-tests/12-rpl/code/root-node.c b/regression-tests/11-rpl/code/root-node.c → regression-tests/12-rpl/code/root-node.c
diff --git a/regression-tests/11-rpl/code/sender-node.c → regression-tests/12-rpl/code/sender-node.c b/regression-tests/11-rpl/code/sender-node.c → regression-tests/12-rpl/code/sender-node.c
diff --git a/...ests/12-ipv6-apps/01-sky-servreg-hack.csc → ...tests/13-ip6-apps/01-sky-servreg-hack.csc b/...ests/12-ipv6-apps/01-sky-servreg-hack.csc → ...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
@@ -0,0 +1 @@
+include ../Makefile.simulation-test
diff --git a/...ssion-tests/12-ipv6-apps/rest_rpl_coap.js → ...ession-tests/13-ip6-apps/rest_rpl_coap.js b/...ssion-tests/12-ipv6-apps/rest_rpl_coap.js → ...ession-tests/13-ip6-apps/rest_rpl_coap.js
diff --git a/...ssion-tests/12-ipv6-apps/x02-sky-coap.csc → ...ession-tests/13-ip6-apps/x02-sky-coap.csc b/...ssion-tests/12-ipv6-apps/x02-sky-coap.csc → ...ession-tests/13-ip6-apps/x02-sky-coap.csc