CI: merge IEEE 802.15.4 and 6tisch tests

.travis.yml

@@ -91,5 +91,4 @@ env:
   - BUILD_TYPE='ipv6' 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'

tests/13-ieee802154/01-panid-handling.csc

@@ -25,7 +25,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype740</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONFIG_DIR]/code/test-panid-handling.c</source>
+      <source>[CONFIG_DIR]/code-panid-handling/test-panid-handling.c</source>
       <commands>make test-panid-handling.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>

tests/13-ieee802154/03-cooja-test-sixtop.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype382</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/tests/16-6tisch/code/test-sixtop.c</source>
+      <source>[CONFIG_DIR]/code-6tisch/test-sixtop.c</source>
       <commands>make clean TARGET=cooja
       make test-sixtop.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@@ -150,7 +150,7 @@
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <scriptfile>[CONTIKI_DIR]/tests/16-6tisch/js/unit-test.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/sixtop-test.js</scriptfile>
       <active>true</active>
     </plugin_config>
     <width>495</width>

tests/13-ieee802154/04-cooja-test-sixp-pkt.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype382</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/tests/16-6tisch/code/test-sixp-pkt.c</source>
+      <source>[CONFIG_DIR]/code-6tisch/test-sixp-pkt.c</source>
       <commands>make clean TARGET=cooja
       make test-sixp-pkt.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@@ -150,7 +150,7 @@
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <scriptfile>[CONTIKI_DIR]/tests/16-6tisch/js/unit-test.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/sixtop-test.js</scriptfile>
       <active>true</active>
     </plugin_config>
     <width>495</width>

tests/13-ieee802154/05-cooja-test-sixp-trans.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype382</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/tests/16-6tisch/code/test-sixp-trans.c</source>
+      <source>[CONFIG_DIR]/code-6tisch/test-sixp-trans.c</source>
       <commands>make clean TARGET=cooja
       make test-sixp-trans.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@@ -150,7 +150,7 @@
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <scriptfile>[CONTIKI_DIR]/tests/16-6tisch/js/unit-test.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/sixtop-test.js</scriptfile>
       <active>true</active>
     </plugin_config>
     <width>495</width>

tests/13-ieee802154/06-cooja-test-sixp-nbr.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype382</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/tests/16-6tisch/code/test-sixp-nbr.c</source>
+      <source>[CONFIG_DIR]/code-6tisch/test-sixp-nbr.c</source>
       <commands>make clean TARGET=cooja
       make test-sixp-nbr.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@@ -150,7 +150,7 @@
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <scriptfile>[CONTIKI_DIR]/tests/16-6tisch/js/unit-test.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/sixtop-test.js</scriptfile>
       <active>true</active>
     </plugin_config>
     <width>495</width>

tests/13-ieee802154/07-cooja-test-sixp.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype382</identifier>
       <description>Cooja Mote Type #1</description>
-      <source>[CONTIKI_DIR]/tests/16-6tisch/code/test-sixp.c</source>
+      <source>[CONFIG_DIR]/code-6tisch/test-sixp.c</source>
       <commands>make clean TARGET=cooja
       make test-sixp.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@@ -150,7 +150,7 @@
   <plugin>
     org.contikios.cooja.plugins.ScriptRunner
     <plugin_config>
-      <scriptfile>[CONTIKI_DIR]/tests/16-6tisch/js/unit-test.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/sixtop-test.js</scriptfile>
       <active>true</active>
     </plugin_config>
     <width>495</width>

tests/16-6tisch/Makefile

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