Merge pull request #1809 from simonduq/pr/fix-travis

Fixes https://github.com/contiki-os/contiki/issues/1808
2016-08-03 16:06:53 +01:00 · 2016-08-03 16:06:53 +01:00 · e0fcbe672f
parent 2657c45f07 a3c8fe6724
commit e0fcbe672f
5 changed files with 4 additions and 4 deletions
--- a/regression-tests/01-compile-base/Makefile
+++ b/regression-tests/01-compile-base/Makefile
@ -35,9 +35,6 @@ wget/minimal-net \
 zolertia/z1/z1 \
 settings-example/avr-raven \
 ipv6/multicast/sky \
-ipv6/rpl-tsch/z1 \
-ipv6/rpl-tsch/z1:MAKE_WITH_ORCHESTRA=1 \
-ipv6/rpl-tsch/z1:MAKE_WITH_SECURITY=1 \
 cfs-coffee/sky \
 cfs-coffee/z1 \
 cfs-coffee/wismote \
--- a/regression-tests/11-ipv6/19-z1-rpl-tsch.csc.flaky
+++ b/regression-tests/11-ipv6/19-z1-rpl-tsch.csc.flaky
--- a/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc.flaky
+++ b/regression-tests/11-ipv6/20-z1-rpl-tsch-orchestra.csc.flaky
--- a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc.flaky
+++ b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc.flaky
--- a/regression-tests/18-compile-arm-ports/Makefile
+++ b/regression-tests/18-compile-arm-ports/Makefile
@ -49,7 +49,10 @@ udp-ipv6/stm32nucleo-spirit1 \
 hello-world/stm32nucleo-spirit1 \
 cfs-coffee/cc2538dk \
 cfs-coffee/openmote-cc2538 \
-cfs-coffee/zoul
+cfs-coffee/zoul \
+ipv6/rpl-tsch/zoul \
+ipv6/rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \
+ipv6/rpl-tsch/zoul:MAKE_WITH_SECURITY=1

 TOOLS=