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

Merge pull request #172 from adamdunkels/feature-split-collect-regression-test

Browse source 
Regression tests: split the collect test into two, moved armgcc download location
This commit is contained in:
Nicolas Tsiftes 2013-03-18 09:22:07 -07:00
parent f81e4071f1 e9b1374383
commit adf401bbad
28 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -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" - "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 ## Install toolchain for mc1233x in care-free way
- "[ $BUILD_TYPE = compile ] && curl -s \ - "[ $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" | 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 ## Install SDCC from a purpose-built bundle
- "[ $BUILD_TYPE = compile ] && curl -s \ - "[ $BUILD_TYPE = compile ] && curl -s \
@ -40,6 +40,7 @@ env:
## of environment variable defined below ## of environment variable defined below
- BUILD_TYPE='compile' - BUILD_TYPE='compile'
- BUILD_TYPE='collect' MAKE_TARGETS='cooja' - BUILD_TYPE='collect' MAKE_TARGETS='cooja'
- BUILD_TYPE='collect-lossy' MAKE_TARGETS='cooja'
- BUILD_TYPE='rpl' MAKE_TARGETS='cooja' - BUILD_TYPE='rpl' MAKE_TARGETS='cooja'
- BUILD_TYPE='rime' MAKE_TARGETS='cooja' - BUILD_TYPE='rime' MAKE_TARGETS='cooja'
- BUILD_TYPE='ipv6' MAKE_TARGETS='cooja' - BUILD_TYPE='ipv6' MAKE_TARGETS='cooja'

2
regression-tests/04-rime/09-cooja-trickle.csc
View file

@ -24,7 +24,7 @@
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype346</identifier> <identifier>mtype346</identifier>
<description>Cooja Mote Type #1</description> <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> <commands>make trickle-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Battery</moteinterface> <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>

2
regression-tests/04-rime/10-cooja-mesh.csc
View file

@ -24,7 +24,7 @@
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype140</identifier> <identifier>mtype140</identifier>
<description>Cooja Mote Type #1</description> <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> <commands>make mesh-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Battery</moteinterface> <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>

0
regression-tests/08-collect/02-sky-shell-collect-lossy.csc → regression-tests/09-collect-lossy/01-sky-shell-collect-lossy.csc
View file

0
regression-tests/09-ipv4/Makefile → regression-tests/09-collect-lossy/Makefile
View file

0
regression-tests/10-ipv6/Makefile → regression-tests/10-ipv4/Makefile
View file

0
regression-tests/09-ipv4/x01-ip-cooja-telnet-ping.csc → regression-tests/10-ipv4/x01-ip-cooja-telnet-ping.csc
View file

0
regression-tests/09-ipv4/x02-ip-sky-telnet-ping.csc → regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc
View file

0
regression-tests/09-ipv4/x03-ip-sky-webserver-wget.csc → regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc
View file

0
regression-tests/10-ipv6/01-cooja-ipv6-udp.csc → regression-tests/11-ipv6/01-cooja-ipv6-udp.csc
View file

0
regression-tests/10-ipv6/02-sky-ipv6-udp.csc → regression-tests/11-ipv6/02-sky-ipv6-udp.csc
View file

0
regression-tests/10-ipv6/03-sky-ipv6-udp-fragmentation.csc → regression-tests/11-ipv6/03-sky-ipv6-udp-fragmentation.csc
View file

0
regression-tests/10-ipv6/04-sky-ipv6-rpl-collect.csc → regression-tests/11-ipv6/04-sky-ipv6-rpl-collect.csc
View file

0
regression-tests/11-rpl/Makefile → regression-tests/11-ipv6/Makefile
View file

6
regression-tests/11-rpl/01-rpl-up-route.csc → regression-tests/12-rpl/01-rpl-up-route.csc
View file

@ -24,7 +24,7 @@
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype456</identifier> <identifier>mtype456</identifier>
<description>Sender</description> <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 <commands>make TARGET=cooja clean
make sender-node.cooja TARGET=cooja</commands> make sender-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype452</identifier> <identifier>mtype452</identifier>
<description>RPL root</description> <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 <commands>make TARGET=cooja clean
make root-node.cooja TARGET=cooja</commands> make root-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype904</identifier> <identifier>mtype904</identifier>
<description>Receiver</description> <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 <commands>make TARGET=cooja clean
make receiver-node.cooja TARGET=cooja</commands> make receiver-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

6
regression-tests/11-rpl/02-rpl-root-reboot.csc → regression-tests/12-rpl/02-rpl-root-reboot.csc
View file

@ -24,7 +24,7 @@
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype748</identifier> <identifier>mtype748</identifier>
<description>Sender</description> <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 <commands>make TARGET=cooja clean
make sender-node.cooja TARGET=cooja</commands> make sender-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype442</identifier> <identifier>mtype442</identifier>
<description>RPL root</description> <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 <commands>make TARGET=cooja clean
make root-node.cooja TARGET=cooja</commands> make root-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype236</identifier> <identifier>mtype236</identifier>
<description>Receiver</description> <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 <commands>make TARGET=cooja clean
make receiver-node.cooja TARGET=cooja</commands> make receiver-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

6
regression-tests/11-rpl/03-rpl-28-hours.csc → regression-tests/12-rpl/03-rpl-28-hours.csc
View file

@ -24,7 +24,7 @@
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype391</identifier> <identifier>mtype391</identifier>
<description>Sender</description> <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 <commands>make TARGET=cooja clean
make sender-node.cooja TARGET=cooja</commands> make sender-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype250</identifier> <identifier>mtype250</identifier>
<description>RPL root</description> <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 <commands>make TARGET=cooja clean
make root-node.cooja TARGET=cooja</commands> make root-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype822</identifier> <identifier>mtype822</identifier>
<description>Receiver</description> <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 <commands>make TARGET=cooja clean
make receiver-node.cooja TARGET=cooja</commands> make receiver-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

6
regression-tests/11-rpl/04-rpl-large-network.csc → regression-tests/12-rpl/04-rpl-large-network.csc
View file

@ -24,7 +24,7 @@
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype456</identifier> <identifier>mtype456</identifier>
<description>Sender</description> <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 <commands>make TARGET=cooja clean
make sender-node.cooja TARGET=cooja</commands> make sender-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -49,7 +49,7 @@ make sender-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype452</identifier> <identifier>mtype452</identifier>
<description>RPL root</description> <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 <commands>make TARGET=cooja clean
make root-node.cooja TARGET=cooja</commands> make root-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
@ -74,7 +74,7 @@ make root-node.cooja TARGET=cooja</commands>
se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.contikimote.ContikiMoteType
<identifier>mtype904</identifier> <identifier>mtype904</identifier>
<description>Receiver</description> <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 <commands>make TARGET=cooja clean
make receiver-node.cooja TARGET=cooja</commands> make receiver-node.cooja TARGET=cooja</commands>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>

0
regression-tests/12-ipv6-apps/Makefile → regression-tests/12-rpl/Makefile
View file

0
regression-tests/11-rpl/code/Makefile → regression-tests/12-rpl/code/Makefile
View file

0
regression-tests/11-rpl/code/project-conf.h → regression-tests/12-rpl/code/project-conf.h
View file

0
regression-tests/11-rpl/code/receiver-node.c → regression-tests/12-rpl/code/receiver-node.c
View file

0
regression-tests/11-rpl/code/root-node.c → regression-tests/12-rpl/code/root-node.c
View file

0
regression-tests/11-rpl/code/sender-node.c → regression-tests/12-rpl/code/sender-node.c
View file

0
regression-tests/12-ipv6-apps/01-sky-servreg-hack.csc → regression-tests/13-ip6-apps/01-sky-servreg-hack.csc
View file

1
regression-tests/13-ip6-apps/Makefile Normal file
View file

@ -0,0 +1 @@
include ../Makefile.simulation-test

0
regression-tests/12-ipv6-apps/rest_rpl_coap.js → regression-tests/13-ip6-apps/rest_rpl_coap.js
View file

0
regression-tests/12-ipv6-apps/x02-sky-coap.csc → regression-tests/13-ip6-apps/x02-sky-coap.csc
View file