CI: merge native ping and RPL BR tests

2017-11-18 02:47:55 -08:00 · 2017-11-18 02:47:55 -08:00 · e62123ef47
parent 55eb462365
commit e62123ef47
13 changed files with 1 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -93,5 +93,4 @@ env:
  - BUILD_TYPE='base' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
  - BUILD_TYPE='ieee802154' BUILD_CATEGORY='sim'
  - BUILD_TYPE='6tisch' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='rpl-border-router' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='native-networking' BUILD_CATEGORY='sim'
+  - BUILD_TYPE='tun-rpl-br' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
--- a/tests/17-rpl-border-router/01-border-router-cooja.csc
+++ b/tests/17-rpl-border-router/01-border-router-cooja.csc
--- a/tests/17-rpl-border-router/01-border-router-cooja.sh
+++ b/tests/17-rpl-border-router/01-border-router-cooja.sh
--- a/tests/17-rpl-border-router/02-border-router-cooja-tsch.csc
+++ b/tests/17-rpl-border-router/02-border-router-cooja-tsch.csc
--- a/tests/17-rpl-border-router/02-border-router-cooja-tsch.sh
+++ b/tests/17-rpl-border-router/02-border-router-cooja-tsch.sh
--- a/tests/17-rpl-border-router/03-border-router-sky.csc
+++ b/tests/17-rpl-border-router/03-border-router-sky.csc
--- a/tests/17-rpl-border-router/03-border-router-sky.sh
+++ b/tests/17-rpl-border-router/03-border-router-sky.sh
--- a/tests/17-rpl-border-router/04-border-router-traceroute.csc
+++ b/tests/17-rpl-border-router/04-border-router-traceroute.csc
--- a/tests/17-rpl-border-router/04-border-router-traceroute.sh
+++ b/tests/17-rpl-border-router/04-border-router-traceroute.sh
--- a/tests/18-native-networking/01-native-ping.sh
+++ b/tests/18-native-networking/01-native-ping.sh
--- a/tests/17-rpl-border-router/Makefile
+++ b/tests/17-rpl-border-router/Makefile
--- a/tests/17-rpl-border-router/test-border-router.sh
+++ b/tests/17-rpl-border-router/test-border-router.sh
--- a/tests/18-native-networking/Makefile
+++ b/tests/18-native-networking/Makefile
@ -1 +0,0 @@
-include ../Makefile.script-test