CI: merge base with nullnet

2017-11-18 02:54:19 -08:00 · 2017-11-18 02:54:19 -08:00 · 97453edfb9
parent e62123ef47
commit 97453edfb9
14 changed files with 1 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -89,8 +89,7 @@ env:
  - BUILD_TYPE='rpl-lite' BUILD_CATEGORY='sim'
  - BUILD_TYPE='rpl-classic' BUILD_CATEGORY='sim'
  - BUILD_TYPE='ipv6' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
-  - BUILD_TYPE='nullnet' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='base' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
+  - BUILD_TYPE='simulation-base' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
  - BUILD_TYPE='ieee802154' BUILD_CATEGORY='sim'
  - BUILD_TYPE='6tisch' BUILD_CATEGORY='sim'
  - BUILD_TYPE='tun-rpl-br' BUILD_CATEGORY='sim' BUILD_ARCH='msp430'
--- a/tests/07-simulation-base/01-hello-world-sky.csc
+++ b/tests/07-simulation-base/01-hello-world-sky.csc
--- a/tests/07-simulation-base/02-ringbufindex.csc
+++ b/tests/07-simulation-base/02-ringbufindex.csc
--- a/tests/07-simulation-base/03-nullnet-broadcast.csc
+++ b/tests/07-simulation-base/03-nullnet-broadcast.csc
--- a/tests/07-simulation-base/04-nullnet-broadcast-tsch.csc
+++ b/tests/07-simulation-base/04-nullnet-broadcast-tsch.csc
--- a/tests/07-simulation-base/05-nullnet-unicast.csc
+++ b/tests/07-simulation-base/05-nullnet-unicast.csc
--- a/tests/07-simulation-base/06-nullnet-unicast-tsch.csc
+++ b/tests/07-simulation-base/06-nullnet-unicast-tsch.csc
--- a/tests/07-simulation-base/Makefile
+++ b/tests/07-simulation-base/Makefile
--- a/tests/07-simulation-base/code/Makefile
+++ b/tests/07-simulation-base/code/Makefile
--- a/tests/07-simulation-base/code/project-conf.h
+++ b/tests/07-simulation-base/code/project-conf.h
--- a/tests/07-simulation-base/code/test-ringbufindex.c
+++ b/tests/07-simulation-base/code/test-ringbufindex.c
--- a/tests/07-simulation-base/hello-world.js
+++ b/tests/07-simulation-base/hello-world.js
--- a/tests/07-simulation-base/js/04-ringbufindex.js
+++ b/tests/07-simulation-base/js/04-ringbufindex.js
--- a/tests/09-nullnet/Makefile
+++ b/tests/09-nullnet/Makefile
@ -1 +0,0 @@
-include ../Makefile.simulation-test