Merge pull request #165 from simonduq/contrib/travis-multiple-seeds

Rework CI test suite
2017-11-23 16:07:36 +01:00 · 2017-11-23 16:07:36 +01:00 · f530fefb1a
parent a7251460a4 f972c1b48e
commit f530fefb1a
115 changed files with 561 additions and 2511 deletions
--- a/.gitignore
+++ b/.gitignore
@ -50,14 +50,11 @@ COOJA.testlog

 #test artifacts
 *.testlog
-*.log.prog
-*.report
-summary
+*.scriptlog
+*.coojalog
 *.summary
-*.runerr
-*.runlog
-*.faillog
-tests/[0-9][0-9]-*/report
+*.err
+summary
 tests/[0-9][0-9]-*/org/

 # x86 UEFI files
--- a/.travis.yml
+++ b/.travis.yml
@ -13,7 +13,11 @@ before_script:
  - sudo apt-get -qq update

  ## Support building a binary that is identical to the CI
-  - echo -n "Contiki will be compiled with RELSTR=" ; git --git-dir .git describe --tags --always
+  - echo -n "Contiki-NG will be compiled with RELSTR=" ; git --git-dir .git describe --tags --always
+
+  ## Install 32-bit compatibility libraries
+  - sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386
+      libstdc++5:i386 libstdc++6:i386 lib32z1

  ## Install doxygen
  - if [ ${BUILD_CATEGORY:-0} = doxygen ] ; then
@ -23,25 +27,26 @@ before_script:
    fi

  ## Install msp430 toolchain
-  - sudo apt-get -qq install lib32z1
-  - $WGET http://simonduq.github.io/resources/mspgcc-4.7.2-compiled.tar.bz2 &&
-    tar xjf mspgcc*.tar.bz2 -C /tmp/ &&
-    sudo cp -f -r /tmp/msp430/* /usr/local/ &&
-    rm -rf /tmp/msp430 mspgcc*.tar.bz2 &&
-    msp430-gcc --version
+  - if [ ${BUILD_ARCH:-0} = msp430 ] ; then
+      $WGET http://simonduq.github.io/resources/mspgcc-4.7.2-compiled.tar.bz2 &&
+      tar xjf mspgcc*.tar.bz2 -C /tmp/ &&
+      sudo cp -f -r /tmp/msp430/* /usr/local/ &&
+      rm -rf /tmp/msp430 mspgcc*.tar.bz2 &&
+      msp430-gcc --version ;
+    fi

-  ## Install 32-bit compatibility libraries
-  - sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386
-      libstdc++5:i386 libstdc++6:i386
-
-  ## Install mainline ARM toolchain and srecord.
+  ## Install mainline ARM toolchain, srecord and nRF52 SDK
  - if [ ${BUILD_ARCH:-0} = arm-aapcs ] ; then
      sudo apt-get -qq install srecord &&
      $WGET https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 &&
      tar xjf gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2 -C /tmp/ &&
      sudo cp -f -r /tmp/gcc-arm-none-eabi-5_2-2015q4/* /usr/local/ &&
      rm -rf /tmp/gcc-arm-none-eabi-* gcc-arm-none-eabi-*-linux.tar.bz2 &&
-      arm-none-eabi-gcc --version ;
+      arm-none-eabi-gcc --version &&
+      $WGET https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip &&
+      mkdir /tmp/nrf52-sdk &&
+      unzip nrf5_iot_sdk_3288530.zip -d /tmp/nrf52-sdk &&
+      export NRF52_SDK_ROOT=/tmp/nrf52-sdk ;
    fi

  ## Install NXP toolchain
@ -60,18 +65,6 @@ before_script:
      ba-elf-gcc --version ;
    fi

-  ## Install mainline ARM toolchain and download nRF52 SDK
-  - if [ ${BUILD_ARCH:-0} = nrf52dk ] ; then
-      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa &&
-      sudo apt-get -qq update &&
-      sudo apt-get -qq install gcc-arm-embedded srecord &&
-      arm-none-eabi-gcc --version &&
-      $WGET https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/nrf5_iot_sdk_3288530.zip &&
-      mkdir /tmp/nrf52-sdk &&
-      unzip nrf5_iot_sdk_3288530.zip -d /tmp/nrf52-sdk &&
-      export NRF52_SDK_ROOT=/tmp/nrf52-sdk ;
-    fi
-
  ## Compile cooja.jar only when it's going to be needed
  - if [ ${BUILD_CATEGORY:-0} = sim ] ; then
      java -version &&
@ -81,33 +74,20 @@ before_script:

 script:
  ## tests/Makefile handles most of generic logic
-  - "make -C tests/??-$BUILD_TYPE RUNALL=true summary"
-
-after_script:
-  ## Print cooja test logs
-  - "[ ${BUILD_CATEGORY:-0} = sim ] && tail tests/??-$BUILD_TYPE/*.testlog"
-  ## Print a basic summary
-  - "echo 'Summary:'; cat tests/??-$BUILD_TYPE/summary"
-  - "FAILS=`grep -c  ' FAIL ' tests/??-$BUILD_TYPE/summary`"
-  ## This will detect whether the build should pass or fail
-  - "test $FAILS -eq 0; exit $?"
-
+  - "make -C tests/??-$BUILD_TYPE"
+  - "tests/check-test.sh tests/??-$BUILD_TYPE; exit $?"

 env:
  ## This magically kick-off parallel jobs for each of the for the sets
  ## of environment variable defined below
-  - BUILD_TYPE='doxygen' BUILD_CATEGORY='doxygen'
-  - BUILD_TYPE='compile-base' BUILD_CATEGORY='compile'
-  - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
+  - BUILD_TYPE='compile-base' BUILD_CATEGORY='compile' BUILD_ARCH='msp430'
+  - BUILD_TYPE='compile-arm-ports-01' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
+  - BUILD_TYPE='compile-arm-ports-02' BUILD_CATEGORY='compile' BUILD_ARCH='arm-aapcs'
  - BUILD_TYPE='compile-nxp-ports' BUILD_CATEGORY='compile' BUILD_ARCH='jn516x'
-  - BUILD_TYPE='compile-nrf52-ports' BUILD_CATEGORY='compile' BUILD_ARCH='nrf52dk'
  - BUILD_TYPE='compile-tools' BUILD_CATEGORY='compile'
  - BUILD_TYPE='rpl-lite' BUILD_CATEGORY='sim'
  - BUILD_TYPE='rpl-classic' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='ipv6' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='nullnet' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='base' BUILD_CATEGORY='sim'
+  - BUILD_TYPE='tun-rpl-br' 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='rpl-border-router' BUILD_CATEGORY='sim'
-  - BUILD_TYPE='native-networking' BUILD_CATEGORY='sim'
+  - BUILD_TYPE='doxygen' BUILD_CATEGORY='doxygen'
--- a/tests/00-doxygen/Makefile
+++ b/tests/00-doxygen/Makefile
@ -27,7 +27,7 @@

 DOCDIR=../../tools/doxygen

-all: summary
+all: clean summary

 doxygen:
 	@make -C $(DOCDIR) 2> doxygen.runerr > doxygen.runlog
@ -36,21 +36,22 @@ summary: doxygen
 	@( \
 		1> summary; \
 		if [ -s doxygen.runerr ] ; then \
-			echo "doxygen: FAIL ಠ_ಠ\nDoxygen caused some errors. Please fix these." >> summary; \
-			echo "Errors:" >> summary; \
-			cat doxygen.runerr >> summary; \
-			echo >> summary; \
+			echo "Doxygen: TEST FAIL" | tee summary; \
+			echo "Errors:"; \
+			cat doxygen.runerr; \
 		fi ; \
 		if [ -s $(DOCDIR)/doxygen.log ] ; then \
-			echo "doxygen: FAIL ಠ_ಠ\nDoxygen caused some warnings. Please fix these." >> summary; \
-			echo "Warnings:" >> summary; \
-			cat $(DOCDIR)/doxygen.log >> summary; \
+			echo "Doxygen: TEST FAIL" | tee summary; \
+			echo "Warnings:"; \
+			cat $(DOCDIR)/doxygen.log; \
 		fi ; \
 		if [ ! -s summary ] ; then \
-			echo "doxygen: OK\nDoxygen found no warnings" >> summary; \
+			echo "Doxygen: TEST OK (no warning nor error)" | tee summary; \
 		fi ; \
-		cat summary \
 	)
+	@rm doxygen.runlog doxygen.runerr
+	@echo "========== Summary =========="
+	@cat summary

 clean:
 	@rm -f summary doxygen.runlog doxygen.runerr
--- a/tests/02-compile-arm-ports-01/Makefile
+++ b/tests/02-compile-arm-ports-01/Makefile
@ -11,10 +11,12 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
 platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
 platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
 platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
-hello-world/cc2538dk \
-rpl-border-router/cc2538dk \
 rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \
-rpl-border-router/zoul \
+sensniff/srf06-cc26xx \
+sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
+6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
+storage/cfs-coffee/cc2538dk \
+sensniff/cc2538dk \
 rpl-udp/cc2538dk \
 coap/cc2538dk \
 slip-radio/cc2538dk \
@ -24,39 +26,15 @@ platform-specific/cc2538-common/cc2538dk \
 platform-specific/cc2538-common/mqtt-demo/cc2538dk \
 platform-specific/cc2538-common/crypto/cc2538dk \
 platform-specific/cc2538-common/pka/cc2538dk \
-platform-specific/cc2538-common/zoul \
-platform-specific/cc2538-common/mqtt-demo/zoul \
-platform-specific/cc2538-common/crypto/zoul \
-platform-specific/cc2538-common/pka/zoul \
-platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \
-coap/zoul \
-ipso-objects/zoul \
-hello-world/zoul \
-sensniff/cc2538dk \
-sensniff/openmote-cc2538 \
-sensniff/zoul \
-sensniff/zoul:ZOUL_CONF_SUB_GHZ_SNIFFER=1 \
-sensniff/srf06-cc26xx \
-sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
-storage/cfs-coffee/cc2538dk \
-storage/cfs-coffee/openmote-cc2538 \
-storage/cfs-coffee/zoul \
-storage/antelope-shell/zoul \
-6tisch/simple-node/zoul \
-6tisch/simple-node/zoul:MAKE_WITH_ORCHESTRA=1 \
-6tisch/simple-node/zoul:MAKE_WITH_SECURITY=1 \
-libs/logging/zoul \
-6tisch/etsi-plugtest-2017/zoul:BOARD=remote \
-6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
-6tisch/6p-packet/zoul \
-6tisch/sixtop/zoul \
-http-socket/zoul \
-libs/timers/zoul \
-libs/energest/zoul \
-libs/trickle-library/zoul \
-nullnet/zoul \
-slip-radio/zoul \
-
+hello-world/cc2538dk \
+rpl-border-router/cc2538dk \
+hello-world/nrf52dk \
+platform-specific/nrf52dk/coap-demo/nrf52dk:coap-server \
+platform-specific/nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
+platform-specific/nrf52dk/mqtt-demo/nrf52dk \
+platform-specific/nrf52dk/blink-hello/nrf52dk \
+platform-specific/nrf52dk/timer-test/nrf52dk \
+libs/logging/nrf52dk

 TOOLS=

--- a/tests/03-compile-arm-ports-02/Makefile
+++ b/tests/03-compile-arm-ports-02/Makefile
@ -0,0 +1,39 @@
+EXAMPLESDIR=../../examples
+TOOLSDIR=../../tools
+
+EXAMPLES = \
+rpl-border-router/zoul \
+platform-specific/cc2538-common/zoul \
+platform-specific/cc2538-common/mqtt-demo/zoul \
+platform-specific/cc2538-common/crypto/zoul \
+platform-specific/cc2538-common/pka/zoul \
+platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \
+coap/zoul \
+ipso-objects/zoul \
+hello-world/zoul \
+sensniff/zoul \
+sensniff/zoul:ZOUL_CONF_SUB_GHZ_SNIFFER=1 \
+storage/cfs-coffee/zoul \
+storage/antelope-shell/zoul \
+6tisch/simple-node/zoul \
+6tisch/simple-node/zoul:MAKE_WITH_ORCHESTRA=1 \
+6tisch/simple-node/zoul:MAKE_WITH_SECURITY=1 \
+libs/logging/zoul \
+6tisch/etsi-plugtest-2017/zoul:BOARD=remote \
+6tisch/6p-packet/zoul \
+6tisch/sixtop/zoul \
+http-socket/zoul \
+libs/timers/zoul \
+libs/energest/zoul \
+libs/trickle-library/zoul \
+nullnet/zoul \
+slip-radio/zoul \
+storage/cfs-coffee/openmote-cc2538 \
+sensniff/openmote-cc2538 \
+hello-world/openmote-cc2538 \
+rpl-udp/openmote-cc2538 \
+rpl-border-router/openmote-cc2538
+
+TOOLS=
+
+include ../Makefile.compile-test
--- a/tests/04-compile-nrf52-ports/Makefile
+++ b/tests/04-compile-nrf52-ports/Makefile
@ -1,20 +0,0 @@
-EXAMPLESDIR=../../examples
-TOOLSDIR=../../tools
-
-# Note, that SERVER_IPV6_ADDR variable is set to ffff on purpose
-# even though it's not a valid IPV6 address. This is due to limitation
-# of the testing framework which splits compliation arguments using
-# a colon.
-
-EXAMPLES = \
-hello-world/nrf52dk \
-platform-specific/nrf52dk/coap-demo/nrf52dk:coap-server \
-platform-specific/nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
-platform-specific/nrf52dk/mqtt-demo/nrf52dk \
-platform-specific/nrf52dk/blink-hello/nrf52dk \
-platform-specific/nrf52dk/timer-test/nrf52dk \
-libs/logging/nrf52dk
-
-TOOLS=
-
-include ../Makefile.compile-test
--- a/tests/04-compile-nxp-ports/Makefile
+++ b/tests/04-compile-nxp-ports/Makefile
--- a/tests/05-compile-tools/Makefile
+++ b/tests/05-compile-tools/Makefile
@ -25,47 +25,24 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.

-TOOLS=sky  tools
-FAILTOOLS=sky=uip6-bridge
+TOOLS=tools tools/sky tools/jn516x
+BASEDIR=../../
+TESTLOGS=$(subst /,__,$(patsubst %,%.testlog, $(TOOLS)))

+all: clean summary

-TOOLSDIR=../../tools
-LOGS=$(patsubst %,%.log, $(TOOLS))
+%.testlog:
+	@echo -n Building tool: $(basename $@)
+	@printf "%-32s" "$@" > $@
+	@$(MAKE) -C $(BASEDIR)/$(basename $(subst __,/,$@)) clean > /dev/null && \
+	  $(MAKE) -C $(BASEDIR)/$(basename $(subst __,/,$@)) > /dev/null && \
+		(echo " -> OK" && echo "TEST OK" >> $@) || \
+		(echo " -> FAIL" && echo "TEST FAIL" >> $@)

-all: summary
-
-FRC:
-
-
-sky.log: RMFILES=serialdump-linux
-
-
-tools.log:
-		@$(MAKE) -C $(TOOLSDIR) > $@ 2>&1 && $(RM) $@.failed || touch $@.failed
-
-
-%.log:  FRC
-	@( cd $(TOOLSDIR)/$(subst =,/,$*) &&  $(RM) $(RMFILES) )
-	@touch $@
-	@$(MAKE) -C $(TOOLSDIR)/$(subst =,/,$*) > $@ 2>&1 && $(RM) $@.failed || touch $@.failed
-
-
-summary: $(LOGS)
-	@(\
-		for T in $(TOOLS) ; do \
-			if [ -f $$T.log.failed  ] ; then \
-				echo tools/$$T: FAIL ಠ_ಠ >> $@;\
-				cat $$T.log >> $@;\
-			else \
-				echo tools/$$T: OK >> $@;\
-			fi\
-		done \
-	)
-	@echo "Info: The following tools need fixing and are not tested:" $(subst =,/,$(FAILTOOLS)) >> $@
-	@echo $@
+summary: $(TESTLOGS)
+	@cat *.testlog > summary
+	@echo "========== Summary =========="
+	@cat summary

 clean:
-	@make -C $(DOCDIR) clean
-
-
-.PHONY: %.log
+	@rm -f *.testlog summary
--- a/tests/07-simulation-base/01-hello-world-sky.csc
+++ b/tests/07-simulation-base/01-hello-world-sky.csc
@ -19,7 +19,7 @@
      <identifier>sky1</identifier>
      <description>Sky Mote Type #1</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
-      <commands EXPORT="discard">make hello-world.sky TARGET=sky</commands>
+      <commands EXPORT="discard">make -j hello-world.sky TARGET=sky</commands>
      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.sky</firmware>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@ -50,7 +50,7 @@
  <plugin>
    org.contikios.cooja.plugins.ScriptRunner
    <plugin_config>
-      <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
+      <scriptfile>[CONFIG_DIR]/js/hello-world.js</scriptfile>
      <active>true</active>
    </plugin_config>
    <width>541</width>
@ -79,4 +79,3 @@
    <location_y>288</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/02-ringbufindex.csc
+++ b/tests/07-simulation-base/02-ringbufindex.csc
@ -25,7 +25,7 @@
      org.contikios.cooja.contikimote.ContikiMoteType
      <identifier>mtype297</identifier>
      <description>ringbufindex testee</description>
-      <source>[CONFIG_DIR]/code/test-ringbufindex.c</source>
+      <source>[CONFIG_DIR]/code-ringbufindex/test-ringbufindex.c</source>
      <commands>make test-ringbufindex.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
--- a/tests/07-simulation-base/03-nullnet-broadcast.csc
+++ b/tests/07-simulation-base/03-nullnet-broadcast.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/nullnet/nullnet-broadcast.c</source>
      <commands>make TARGET=cooja clean
-make nullnet-broadcast.cooja TARGET=cooja</commands>
+make -j nullnet-broadcast.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/07-simulation-base/04-nullnet-broadcast-tsch.csc
+++ b/tests/07-simulation-base/04-nullnet-broadcast-tsch.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/nullnet/nullnet-broadcast.c</source>
      <commands>make TARGET=cooja clean
-make nullnet-broadcast.cooja MAKE_MAC=MAKE_MAC_TSCH TARGET=cooja</commands>
+make -j nullnet-broadcast.cooja MAKE_MAC=MAKE_MAC_TSCH TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/07-simulation-base/05-nullnet-unicast.csc
+++ b/tests/07-simulation-base/05-nullnet-unicast.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/nullnet/nullnet-broadcast.c</source>
      <commands>make TARGET=cooja clean
-make nullnet-broadcast.cooja TARGET=cooja</commands>
+make -j nullnet-broadcast.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/07-simulation-base/06-nullnet-unicast-tsch.csc
+++ b/tests/07-simulation-base/06-nullnet-unicast-tsch.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/nullnet/nullnet-broadcast.c</source>
      <commands>make TARGET=cooja clean
-make nullnet-broadcast.cooja MAKE_MAC=MAKE_MAC_TSCH TARGET=cooja</commands>
+make -j nullnet-broadcast.cooja MAKE_MAC=MAKE_MAC_TSCH TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/07-simulation-base/10-sky-slip-radio.csc
+++ b/tests/07-simulation-base/10-sky-slip-radio.csc
@ -25,7 +25,7 @@
      <identifier>sky1</identifier>
      <description>slip radio</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/slip-radio/slip-radio.c</source>
-      <commands EXPORT="discard">make slip-radio.sky TARGET=sky</commands>
+      <commands EXPORT="discard">make -j slip-radio.sky TARGET=sky</commands>
      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/slip-radio/slip-radio.sky</firmware>
      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
@ -48,7 +48,7 @@
      <identifier>sky2</identifier>
      <description>wait-dag</description>
      <source EXPORT="discard">[CONFIG_DIR]/code-slip-radio/wait-dag.c</source>
-      <commands EXPORT="discard">make wait-dag.sky TARGET=sky</commands>
+      <commands EXPORT="discard">make -j wait-dag.sky TARGET=sky</commands>
      <firmware EXPORT="copy">[CONFIG_DIR]/code-slip-radio/wait-dag.sky</firmware>
      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
--- a/tests/07-simulation-base/15-cooja-multicast-11-hops-rollt-tm.csc
+++ b/tests/07-simulation-base/15-cooja-multicast-11-hops-rollt-tm.csc
@ -25,7 +25,7 @@
      <identifier>mtype612</identifier>
      <description>Root/sender</description>
      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
+      <commands>make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -49,7 +49,7 @@
      <identifier>mtype890</identifier>
      <description>Intermediate</description>
      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
-      <commands>make intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
+      <commands>make -j intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -364,4 +364,3 @@ log.testOK(); /* Report test success and quit */</script>
    <location_y>77</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/16-cooja-multicast-11-hops-smrf.csc
+++ b/tests/07-simulation-base/16-cooja-multicast-11-hops-smrf.csc
@ -25,7 +25,7 @@
      <identifier>mtype612</identifier>
      <description>Root/sender</description>
      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
+      <commands>make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -49,7 +49,7 @@
      <identifier>mtype890</identifier>
      <description>Intermediate</description>
      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
-      <commands>make intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
+      <commands>make -j intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -73,7 +73,7 @@
      <identifier>mtype956</identifier>
      <description>Receiver</description>
      <source>[CONTIKI_DIR]/examples/multicast/sink.c</source>
-      <commands>make sink.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
+      <commands>make -j sink.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -364,4 +364,3 @@ log.testOK(); /* Report test success and quit */</script>
    <location_y>77</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/17-cooja-multicast-11-hops-esmrf.csc
+++ b/tests/07-simulation-base/17-cooja-multicast-11-hops-esmrf.csc
@ -25,7 +25,7 @@
      <identifier>mtype612</identifier>
      <description>Root/sender</description>
      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
+      <commands>make -j root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -49,7 +49,7 @@
      <identifier>mtype890</identifier>
      <description>Intermediate</description>
      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
-      <commands>make intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
+      <commands>make -j intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -364,4 +364,3 @@ log.testOK(); /* Report test success and quit */</script>
    <location_y>77</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/18-cooja-multicast-31-hops.csc
+++ b/tests/07-simulation-base/18-cooja-multicast-31-hops.csc
@ -25,7 +25,7 @@
      <identifier>mtype816</identifier>
      <description>Root/sender</description>
      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
-      <commands>make root.cooja TARGET=cooja</commands>
+      <commands>make -j root.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -49,7 +49,7 @@
      <identifier>mtype53</identifier>
      <description>Intermediate</description>
      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
-      <commands>make intermediate.cooja TARGET=cooja</commands>
+      <commands>make -j intermediate.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -73,7 +73,7 @@
      <identifier>mtype191</identifier>
      <description>Receiver</description>
      <source>[CONTIKI_DIR]/examples/multicast/sink.c</source>
-      <commands>make sink.cooja TARGET=cooja</commands>
+      <commands>make -j sink.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -704,4 +704,3 @@ log.testOK(); /* Report test success and quit */</script>
    <location_y>77</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/19-cooja-rpl-tsch.csc
+++ b/tests/07-simulation-base/19-cooja-rpl-tsch.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #mtype1</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
      <commands EXPORT="discard">make TARGET=cooja clean
-make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
+make -j node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/07-simulation-base/20-cooja-rpl-tsch-orchestra.csc
+++ b/tests/07-simulation-base/20-cooja-rpl-tsch-orchestra.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #mtype11</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
      <commands EXPORT="discard">make TARGET=cooja clean
-make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=1 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
+make -j node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=1 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
      <firmware
          EXPORT="copy">[CONTIKI_DIR]/examples/6tisch/simple-node/node.mtype1</firmware>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@ -294,4 +294,3 @@ while(true) {;&#xD;
    <location_y>111</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/21-cooja-rpl-tsch-security.csc
+++ b/tests/07-simulation-base/21-cooja-rpl-tsch-security.csc
@ -26,7 +26,7 @@
      <description>Cooja Mote Type #mtype11</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
      <commands EXPORT="discard">make TARGET=cooja clean
-make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
+make -j node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -292,4 +292,3 @@ while(true) {;&#xD;
    <location_y>111</location_y>
  </plugin>
 </simconf>
-
--- a/tests/07-simulation-base/Makefile
+++ b/tests/07-simulation-base/Makefile
--- a/tests/07-simulation-base/code-ipv6/receiver/Makefile
+++ b/tests/07-simulation-base/code-ipv6/receiver/Makefile
--- a/tests/07-simulation-base/code-ipv6/receiver/project-conf.h
+++ b/tests/07-simulation-base/code-ipv6/receiver/project-conf.h
--- a/tests/07-simulation-base/code-ipv6/receiver/udp-receiver.c
+++ b/tests/07-simulation-base/code-ipv6/receiver/udp-receiver.c
--- a/tests/07-simulation-base/code-ipv6/sender/Makefile
+++ b/tests/07-simulation-base/code-ipv6/sender/Makefile
--- a/tests/07-simulation-base/code-ipv6/sender/project-conf.h
+++ b/tests/07-simulation-base/code-ipv6/sender/project-conf.h
--- a/tests/07-simulation-base/code-ipv6/sender/udp-sender.c
+++ b/tests/07-simulation-base/code-ipv6/sender/udp-sender.c
--- a/tests/07-simulation-base/code-ipv6/sender/unicast-sender.c
+++ b/tests/07-simulation-base/code-ipv6/sender/unicast-sender.c
--- a/tests/07-simulation-base/code-ringbufindex/Makefile
+++ b/tests/07-simulation-base/code-ringbufindex/Makefile
--- a/tests/07-simulation-base/code-ringbufindex/project-conf.h
+++ b/tests/07-simulation-base/code-ringbufindex/project-conf.h
--- a/tests/07-simulation-base/code-ringbufindex/test-ringbufindex.c
+++ b/tests/07-simulation-base/code-ringbufindex/test-ringbufindex.c
--- a/tests/07-simulation-base/code-slip-radio/Makefile
+++ b/tests/07-simulation-base/code-slip-radio/Makefile
--- a/tests/07-simulation-base/code-slip-radio/project-conf.h
+++ b/tests/07-simulation-base/code-slip-radio/project-conf.h
--- a/tests/07-simulation-base/code-slip-radio/wait-dag.c
+++ b/tests/07-simulation-base/code-slip-radio/wait-dag.c
--- a/tests/07-simulation-base/js/04-ringbufindex.js
+++ b/tests/07-simulation-base/js/04-ringbufindex.js
--- a/tests/07-simulation-base/js/hello-world.js
+++ b/tests/07-simulation-base/js/hello-world.js
--- a/tests/08-ipv6/Makefile
+++ b/tests/08-ipv6/Makefile
@ -1 +0,0 @@
-include ../Makefile.simulation-test
--- a/tests/08-ipv6/fragmentation-should-receive-all.js
+++ b/tests/08-ipv6/fragmentation-should-receive-all.js
@ -1,23 +0,0 @@
-TIMEOUT(200000, log.log("last message: " + msg + "\n"));
-
-data = 0;
-alive = 0;
-while(true) {
-    YIELD();
-    if(msg.startsWith('Data')) {
-        data++;
-        log.log("Heard " + data + " data messages\n");
-    }
-    if(msg.startsWith('Alive')) {
-        alive++;
-        log.log("Heard " + alive + " alive messages\n");
-    }
-    if(data == 10 && alive == 10) {
-        if(msg.startsWith('Data 10') ||
-           msg.startsWith('Alive 10')) {
-            log.testOK();
-        } else {
-            log.testError();
-        }
-    }
-}
--- a/tests/08-ipv6/fragmentation-should-receive-none.js
+++ b/tests/08-ipv6/fragmentation-should-receive-none.js
@ -1,22 +0,0 @@
-TIMEOUT(200000, log.log("last message: " + msg + "\n"));
-
-data = 0;
-alive = 0;
-while(true) {
-    YIELD();
-    if(msg.startsWith('Data')) {
-        data++;
-        log.log("Heard " + data + " data messages\n");
-    }
-    if(msg.startsWith('Alive')) {
-        alive++;
-        log.log("Heard " + alive + " alive messages\n");
-    }
-    if(data == 0 && alive == 10) {
-        if(msg.startsWith('Alive 10')) {
-            log.testOK();
-        } else {
-            log.testError();
-        }
-    }
-}
--- a/tests/09-nullnet/Makefile
+++ b/tests/09-nullnet/Makefile
@ -1 +0,0 @@
-include ../Makefile.simulation-test
--- a/tests/13-ieee802154/01-panid-handling.csc
+++ b/tests/13-ieee802154/01-panid-handling.csc
@ -25,8 +25,8 @@
      org.contikios.cooja.contikimote.ContikiMoteType
      <identifier>mtype740</identifier>
      <description>Cooja Mote Type #1</description>
-      <source>[CONFIG_DIR]/code/test-panid-handling.c</source>
-      <commands>make test-panid-handling.cooja TARGET=cooja</commands>
+      <source>[CONFIG_DIR]/code-panid-handling/test-panid-handling.c</source>
+      <commands>make -j test-panid-handling.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/13-ieee802154/02-tsch-flush-nbr-queue.csc
+++ b/tests/13-ieee802154/02-tsch-flush-nbr-queue.csc
@ -25,7 +25,7 @@
      <identifier>mtype476</identifier>
      <description>Cooja Mote Type #1</description>
      <source>[CONFIG_DIR]/code-flush-nbr-queue/test-flush-nbr-queue.c</source>
-      <commands>make test-flush-nbr-queue.cooja TARGET=cooja</commands>
+      <commands>make -j test-flush-nbr-queue.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/13-ieee802154/03-cooja-test-sixtop.csc
+++ b/tests/13-ieee802154/03-cooja-test-sixtop.csc
@ -24,9 +24,9 @@
      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-sixtop.c</source>
      <commands>make clean TARGET=cooja
-      make test-sixp.cooja TARGET=cooja</commands>
+      make -j test-sixtop.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</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>
@ -160,4 +160,3 @@
    <location_y>105</location_y>
  </plugin>
 </simconf>
-
--- a/tests/13-ieee802154/04-cooja-test-sixp-pkt.csc
+++ b/tests/13-ieee802154/04-cooja-test-sixp-pkt.csc
@ -24,9 +24,9 @@
      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-sixp-pkt.c</source>
      <commands>make clean TARGET=cooja
-      make test-sixtop.cooja TARGET=cooja</commands>
+      make -j test-sixp-pkt.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</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>
@ -160,4 +160,3 @@
    <location_y>105</location_y>
  </plugin>
 </simconf>
-
--- a/tests/13-ieee802154/05-cooja-test-sixp-trans.csc
+++ b/tests/13-ieee802154/05-cooja-test-sixp-trans.csc
@ -24,9 +24,9 @@
      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-trans.c</source>
      <commands>make clean TARGET=cooja
-      make test-sixp-pkt.cooja TARGET=cooja</commands>
+      make -j test-sixp-trans.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</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>
@ -160,4 +160,3 @@
    <location_y>105</location_y>
  </plugin>
 </simconf>
-
--- a/tests/13-ieee802154/06-cooja-test-sixp-nbr.csc
+++ b/tests/13-ieee802154/06-cooja-test-sixp-nbr.csc
@ -24,9 +24,9 @@
      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>
+      make -j test-sixp-nbr.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</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>
@ -160,4 +160,3 @@
    <location_y>105</location_y>
  </plugin>
 </simconf>
-
--- a/tests/13-ieee802154/07-cooja-test-sixp.csc
+++ b/tests/13-ieee802154/07-cooja-test-sixp.csc
@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[APPS_DIR]/mrm</project>
+  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
+  <project EXPORT="discard">[APPS_DIR]/avrora</project>
+  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
+  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
+  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
+  <simulation>
+    <title>My simulation</title>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      org.contikios.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      org.contikios.cooja.contikimote.ContikiMoteType
+      <identifier>mtype382</identifier>
+      <description>Cooja Mote Type #1</description>
+      <source>[CONFIG_DIR]/code-6tisch/test-sixp.c</source>
+      <commands>make clean TARGET=cooja
+      make -j test-sixp.cooja TARGET=cooja</commands>
+      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
+      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiEEPROM</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
+      <symbols>false</symbols>
+    </motetype>
+    <mote>
+      <interface_config>
+        org.contikios.cooja.interfaces.Position
+        <x>47.60131881808453</x>
+        <y>20.028921031789082</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+        <id>1</id>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiRadio
+        <bitrate>250.0</bitrate>
+      </interface_config>
+      <interface_config>
+        org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+        <eeprom>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</eeprom>
+      </interface_config>
+      <motetype_identifier>mtype382</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    org.contikios.cooja.plugins.SimControl
+    <width>280</width>
+    <z>5</z>
+    <height>160</height>
+    <location_x>400</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Visualizer
+    <plugin_config>
+      <moterelations>true</moterelations>
+      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.TrafficVisualizerSkin</skin>
+      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 150.72607380174134 154.79188997110083</viewport>
+    </plugin_config>
+    <width>400</width>
+    <z>4</z>
+    <height>400</height>
+    <location_x>1</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <formatted_time />
+      <coloring />
+    </plugin_config>
+    <width>1320</width>
+    <z>3</z>
+    <height>240</height>
+    <location_x>400</location_x>
+    <location_y>160</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.TimeLine
+    <plugin_config>
+      <mote>0</mote>
+      <showRadioRXTX />
+      <showRadioHW />
+      <showLEDs />
+      <zoomfactor>500.0</zoomfactor>
+    </plugin_config>
+    <width>1720</width>
+    <z>2</z>
+    <height>166</height>
+    <location_x>0</location_x>
+    <location_y>957</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.Notes
+    <plugin_config>
+      <notes>Enter notes here</notes>
+      <decorations>true</decorations>
+    </plugin_config>
+    <width>1040</width>
+    <z>1</z>
+    <height>160</height>
+    <location_x>680</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.RadioLogger
+    <plugin_config>
+      <split>150</split>
+      <formatted_time />
+      <showdups>false</showdups>
+      <hidenodests>false</hidenodests>
+      <analyzers name="6lowpan-pcap" />
+    </plugin_config>
+    <width>500</width>
+    <z>0</z>
+    <height>300</height>
+    <location_x>290</location_x>
+    <location_y>422</location_y>
+  </plugin>
+  <plugin>
+    org.contikios.cooja.plugins.ScriptRunner
+    <plugin_config>
+      <scriptfile>[CONFIG_DIR]/js/sixtop-test.js</scriptfile>
+      <active>true</active>
+    </plugin_config>
+    <width>495</width>
+    <z>0</z>
+    <height>525</height>
+    <location_x>663</location_x>
+    <location_y>105</location_y>
+  </plugin>
+</simconf>
--- a/tests/13-ieee802154/code-6tisch/Makefile
+++ b/tests/13-ieee802154/code-6tisch/Makefile
--- a/tests/13-ieee802154/code-6tisch/common.c
+++ b/tests/13-ieee802154/code-6tisch/common.c
--- a/tests/13-ieee802154/code-6tisch/common.h
+++ b/tests/13-ieee802154/code-6tisch/common.h
--- a/tests/13-ieee802154/code-6tisch/project-conf.h
+++ b/tests/13-ieee802154/code-6tisch/project-conf.h
--- a/tests/13-ieee802154/code-6tisch/test-sixp-nbr.c
+++ b/tests/13-ieee802154/code-6tisch/test-sixp-nbr.c
--- a/tests/13-ieee802154/code-6tisch/test-sixp-pkt.c
+++ b/tests/13-ieee802154/code-6tisch/test-sixp-pkt.c
@ -2001,7 +2001,7 @@ UNIT_TEST(test_set_get_cell_list_add_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2048,7 +2048,7 @@ UNIT_TEST(test_set_get_cell_list_delete_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2095,7 +2095,7 @@ UNIT_TEST(test_set_get_cell_list_relocate_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2132,7 +2132,7 @@ UNIT_TEST(test_set_get_cell_list_count_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2169,7 +2169,7 @@ UNIT_TEST(test_set_get_cell_list_list_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2206,7 +2206,7 @@ UNIT_TEST(test_set_get_cell_list_clear_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2243,7 +2243,7 @@ UNIT_TEST(test_set_get_cell_list_success_res)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2281,7 +2281,7 @@ UNIT_TEST(test_set_get_cell_list_success_conf)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2319,7 +2319,7 @@ UNIT_TEST(test_set_get_cell_list_error_res)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2356,7 +2356,7 @@ UNIT_TEST(test_set_get_cell_list_error_conf)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2393,7 +2393,7 @@ UNIT_TEST(test_set_get_rel_cell_list_add_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2436,7 +2436,7 @@ UNIT_TEST(test_set_get_rel_cell_list_delete_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2479,7 +2479,7 @@ UNIT_TEST(test_set_get_rel_cell_list_relocate_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2523,7 +2523,7 @@ UNIT_TEST(test_set_get_rel_cell_list_count_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2559,7 +2559,7 @@ UNIT_TEST(test_set_get_rel_cell_list_list_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2595,7 +2595,7 @@ UNIT_TEST(test_set_get_rel_cell_list_clear_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2632,7 +2632,7 @@ UNIT_TEST(test_set_get_rel_cell_list_success_res)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2669,7 +2669,7 @@ UNIT_TEST(test_set_get_rel_cell_list_success_conf)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2706,7 +2706,7 @@ UNIT_TEST(test_set_get_rel_cell_list_error_res)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2743,7 +2743,7 @@ UNIT_TEST(test_set_get_rel_cell_list_error_conf)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2779,7 +2779,7 @@ UNIT_TEST(test_set_get_cand_cell_list_add_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2822,7 +2822,7 @@ UNIT_TEST(test_set_get_cand_cell_list_delete_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2865,7 +2865,7 @@ UNIT_TEST(test_set_get_cand_cell_list_relocate_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2909,7 +2909,7 @@ UNIT_TEST(test_set_get_cand_cell_list_count_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2945,7 +2945,7 @@ UNIT_TEST(test_set_get_cand_cell_list_list_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -2981,7 +2981,7 @@ UNIT_TEST(test_set_get_cand_cell_list_clear_req)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -3018,7 +3018,7 @@ UNIT_TEST(test_set_get_cand_cell_list_success_res)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -3055,7 +3055,7 @@ UNIT_TEST(test_set_get_cand_cell_list_success_conf)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -3092,7 +3092,7 @@ UNIT_TEST(test_set_get_cand_cell_list_error_res)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

@ -3129,7 +3129,7 @@ UNIT_TEST(test_set_get_cand_cell_list_error_conf)
                              0xde, 0xad, 0xbe, 0xef,
                              0xca, 0xfe, 0xca, 0xfe};
  const uint8_t *result;
-  sixp_pkt_offset_t result_len;
+  sixp_pkt_offset_t result_len = 0;

  UNIT_TEST_BEGIN();

--- a/tests/13-ieee802154/code-6tisch/test-sixp-trans.c
+++ b/tests/13-ieee802154/code-6tisch/test-sixp-trans.c
--- a/tests/13-ieee802154/code-6tisch/test-sixp.c
+++ b/tests/13-ieee802154/code-6tisch/test-sixp.c
--- a/tests/13-ieee802154/code-6tisch/test-sixtop.c
+++ b/tests/13-ieee802154/code-6tisch/test-sixtop.c
--- a/tests/13-ieee802154/code-panid-handling/Makefile
+++ b/tests/13-ieee802154/code-panid-handling/Makefile
--- a/tests/13-ieee802154/code-panid-handling/project-conf.h
+++ b/tests/13-ieee802154/code-panid-handling/project-conf.h
--- a/tests/13-ieee802154/code-panid-handling/project-tsch-conf.h
+++ b/tests/13-ieee802154/code-panid-handling/project-tsch-conf.h
--- a/tests/13-ieee802154/code-panid-handling/test-panid-handling.c
+++ b/tests/13-ieee802154/code-panid-handling/test-panid-handling.c
--- a/tests/13-ieee802154/js/sixtop-test.js
+++ b/tests/13-ieee802154/js/sixtop-test.js
--- a/tests/14-rpl-lite/01-rpl-up-route.csc
+++ b/tests/14-rpl-lite/01-rpl-up-route.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make TARGET=cooja clean
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make TARGET=cooja clean
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make TARGET=cooja clean
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/14-rpl-lite/03-rpl-28-hours.csc
+++ b/tests/14-rpl-lite/03-rpl-28-hours.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make TARGET=cooja clean
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make TARGET=cooja clean
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make TARGET=cooja clean
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/14-rpl-lite/05-rpl-up-and-down-routes.csc
+++ b/tests/14-rpl-lite/05-rpl-up-and-down-routes.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -339,4 +339,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/06-rpl-temporary-root-loss.csc
+++ b/tests/14-rpl-lite/06-rpl-temporary-root-loss.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -345,4 +345,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/07-rpl-random-rearrangement.csc
+++ b/tests/14-rpl-lite/07-rpl-random-rearrangement.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -645,4 +645,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/08-rpl-dao-route-loss-0.csc
+++ b/tests/14-rpl-lite/08-rpl-dao-route-loss-0.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/08-rpl-dao-route-loss-1.csc
+++ b/tests/14-rpl-lite/08-rpl-dao-route-loss-1.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/08-rpl-dao-route-loss-2.csc
+++ b/tests/14-rpl-lite/08-rpl-dao-route-loss-2.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/08-rpl-dao-route-loss-3.csc
+++ b/tests/14-rpl-lite/08-rpl-dao-route-loss-3.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/08-rpl-dao-route-loss-4.csc
+++ b/tests/14-rpl-lite/08-rpl-dao-route-loss-4.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/08-rpl-dao-route-loss-5.csc
+++ b/tests/14-rpl-lite/08-rpl-dao-route-loss-5.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/14-rpl-lite/09-rpl-probing.csc
+++ b/tests/14-rpl-lite/09-rpl-probing.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/15-rpl-classic/01-rpl-up-route.csc
+++ b/tests/15-rpl-classic/01-rpl-up-route.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make TARGET=cooja clean
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make TARGET=cooja clean
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make TARGET=cooja clean
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/15-rpl-classic/02-rpl-root-reboot.csc
+++ b/tests/15-rpl-classic/02-rpl-root-reboot.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make TARGET=cooja clean
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make TARGET=cooja clean
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make TARGET=cooja clean
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -341,4 +341,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/03-rpl-28-hours.csc
+++ b/tests/15-rpl-classic/03-rpl-28-hours.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make TARGET=cooja clean
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make TARGET=cooja clean
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make TARGET=cooja clean
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/15-rpl-classic/05-rpl-up-and-down-routes.csc
+++ b/tests/15-rpl-classic/05-rpl-up-and-down-routes.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -339,4 +339,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/06-rpl-temporary-root-loss.csc
+++ b/tests/15-rpl-classic/06-rpl-temporary-root-loss.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -345,4 +345,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/07-rpl-random-rearrangement.csc
+++ b/tests/15-rpl-classic/07-rpl-random-rearrangement.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -645,4 +645,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/08-rpl-dao-route-loss-0.csc
+++ b/tests/15-rpl-classic/08-rpl-dao-route-loss-0.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/08-rpl-dao-route-loss-1.csc
+++ b/tests/15-rpl-classic/08-rpl-dao-route-loss-1.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/08-rpl-dao-route-loss-2.csc
+++ b/tests/15-rpl-classic/08-rpl-dao-route-loss-2.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/08-rpl-dao-route-loss-3.csc
+++ b/tests/15-rpl-classic/08-rpl-dao-route-loss-3.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/08-rpl-dao-route-loss-4.csc
+++ b/tests/15-rpl-classic/08-rpl-dao-route-loss-4.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/08-rpl-dao-route-loss-5.csc
+++ b/tests/15-rpl-classic/08-rpl-dao-route-loss-5.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -357,4 +357,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/15-rpl-classic/09-rpl-probing.csc
+++ b/tests/15-rpl-classic/09-rpl-probing.csc
@ -26,7 +26,7 @@
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
      <commands>make clean TARGET=cooja
-make sender-node.cooja TARGET=cooja</commands>
+make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@ make sender-node.cooja TARGET=cooja</commands>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
      <commands>make clean TARGET=cooja
-make root-node.cooja TARGET=cooja</commands>
+make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -76,7 +76,7 @@ make root-node.cooja TARGET=cooja</commands>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
      <commands>make clean TARGET=cooja
-make receiver-node.cooja TARGET=cooja</commands>
+make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/15-rpl-classic/10-rpl-multi-dodag.csc
+++ b/tests/15-rpl-classic/10-rpl-multi-dodag.csc
@ -27,7 +27,7 @@
      <identifier>mtype301</identifier>
      <description>Sender</description>
      <source>[CONFIG_DIR]/code/sender-node.c</source>
-      <commands>make sender-node.cooja TARGET=cooja</commands>
+      <commands>make -j sender-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -51,7 +51,7 @@
      <identifier>mtype820</identifier>
      <description>RPL root</description>
      <source>[CONFIG_DIR]/code/root-node.c</source>
-      <commands>make root-node.cooja TARGET=cooja</commands>
+      <commands>make -j root-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -75,7 +75,7 @@
      <identifier>mtype306</identifier>
      <description>Receiver</description>
      <source>[CONFIG_DIR]/code/receiver-node.c</source>
-      <commands>make receiver-node.cooja TARGET=cooja</commands>
+      <commands>make -j receiver-node.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -386,4 +386,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-
--- a/tests/16-6tisch/03-cooja-test-sixp-trans.csc
+++ b/tests/16-6tisch/03-cooja-test-sixp-trans.csc
@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <project EXPORT="discard">[APPS_DIR]/mrm</project>
-  <project EXPORT="discard">[APPS_DIR]/mspsim</project>
-  <project EXPORT="discard">[APPS_DIR]/avrora</project>
-  <project EXPORT="discard">[APPS_DIR]/serial_socket</project>
-  <project EXPORT="discard">[APPS_DIR]/collect-view</project>
-  <project EXPORT="discard">[APPS_DIR]/powertracker</project>
-  <simulation>
-    <title>My simulation</title>
-    <randomseed>123456</randomseed>
-    <motedelay_us>1000000</motedelay_us>
-    <radiomedium>
-      org.contikios.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <events>
-      <logoutput>40000</logoutput>
-    </events>
-    <motetype>
-      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>
-      <commands>make clean TARGET=cooja
-      make test-sixp-trans.cooja TARGET=cooja</commands>
-      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiButton</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiClock</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiLED</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
-      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiEEPROM</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
-      <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
-      <symbols>false</symbols>
-    </motetype>
-    <mote>
-      <interface_config>
-        org.contikios.cooja.interfaces.Position
-        <x>47.60131881808453</x>
-        <y>20.028921031789082</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.contikimote.interfaces.ContikiMoteID
-        <id>1</id>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.contikimote.interfaces.ContikiRadio
-        <bitrate>250.0</bitrate>
-      </interface_config>
-      <interface_config>
-        org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
-        <eeprom>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</eeprom>
-      </interface_config>
-      <motetype_identifier>mtype382</motetype_identifier>
-    </mote>
-  </simulation>
-  <plugin>
-    org.contikios.cooja.plugins.SimControl
-    <width>280</width>
-    <z>5</z>
-    <height>160</height>
-    <location_x>400</location_x>
-    <location_y>0</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.Visualizer
-    <plugin_config>
-      <moterelations>true</moterelations>
-      <skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>org.contikios.cooja.plugins.skins.GridVisualizerSkin</skin>
-      <skin>org.contikios.cooja.plugins.skins.TrafficVisualizerSkin</skin>
-      <skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
-      <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 150.72607380174134 154.79188997110083</viewport>
-    </plugin_config>
-    <width>400</width>
-    <z>4</z>
-    <height>400</height>
-    <location_x>1</location_x>
-    <location_y>1</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <formatted_time />
-      <coloring />
-    </plugin_config>
-    <width>1320</width>
-    <z>3</z>
-    <height>240</height>
-    <location_x>400</location_x>
-    <location_y>160</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.TimeLine
-    <plugin_config>
-      <mote>0</mote>
-      <showRadioRXTX />
-      <showRadioHW />
-      <showLEDs />
-      <zoomfactor>500.0</zoomfactor>
-    </plugin_config>
-    <width>1720</width>
-    <z>2</z>
-    <height>166</height>
-    <location_x>0</location_x>
-    <location_y>957</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.Notes
-    <plugin_config>
-      <notes>Enter notes here</notes>
-      <decorations>true</decorations>
-    </plugin_config>
-    <width>1040</width>
-    <z>1</z>
-    <height>160</height>
-    <location_x>680</location_x>
-    <location_y>0</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.RadioLogger
-    <plugin_config>
-      <split>150</split>
-      <formatted_time />
-      <showdups>false</showdups>
-      <hidenodests>false</hidenodests>
-      <analyzers name="6lowpan-pcap" />
-    </plugin_config>
-    <width>500</width>
-    <z>0</z>
-    <height>300</height>
-    <location_x>290</location_x>
-    <location_y>422</location_y>
-  </plugin>
-  <plugin>
-    org.contikios.cooja.plugins.ScriptRunner
-    <plugin_config>
-      <scriptfile>[CONTIKI_DIR]/tests/16-6tisch/js/unit-test.js</scriptfile>
-      <active>true</active>
-    </plugin_config>
-    <width>495</width>
-    <z>0</z>
-    <height>525</height>
-    <location_x>663</location_x>
-    <location_y>105</location_y>
-  </plugin>
-</simconf>
-
--- a/tests/16-6tisch/Makefile
+++ b/tests/16-6tisch/Makefile
@ -1 +0,0 @@
-include ../Makefile.simulation-test
--- a/tests/17-rpl-border-router/01-border-router-cooja.csc
+++ b/tests/17-rpl-border-router/01-border-router-cooja.csc
@ -27,7 +27,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/rpl-border-router/border-router.c</source>
      <commands>make TARGET=cooja clean
-make border-router.cooja TARGET=cooja</commands>
+make -j border-router.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -53,7 +53,7 @@ make border-router.cooja TARGET=cooja</commands>
      <description>Cooja Mote Type #2</description>
      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
      <commands>make TARGET=cooja clean
-make hello-world.cooja TARGET=cooja</commands>
+make -j hello-world.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- 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
@ -27,7 +27,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/rpl-border-router/border-router.c</source>
      <commands>make TARGET=cooja clean
-make border-router.cooja TARGET=cooja MAKE_MAC=MAKE_MAC_TSCH</commands>
+make -j border-router.cooja TARGET=cooja MAKE_MAC=MAKE_MAC_TSCH</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -53,7 +53,7 @@ make border-router.cooja TARGET=cooja MAKE_MAC=MAKE_MAC_TSCH</commands>
      <description>Cooja Mote Type #2</description>
      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
      <commands>make TARGET=cooja clean
-make hello-world.cooja TARGET=cooja MAKE_MAC=MAKE_MAC_TSCH</commands>
+make -j hello-world.cooja TARGET=cooja MAKE_MAC=MAKE_MAC_TSCH</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- 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
@ -27,7 +27,7 @@
      <description>Sky Mote Type #sky1</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-border-router/border-router.c</source>
      <commands EXPORT="discard">make clean TARGET=sky
-make border-router.sky TARGET=sky</commands>
+make -j border-router.sky TARGET=sky</commands>
      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-border-router/border-router.sky</firmware>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
@ -51,7 +51,7 @@ make border-router.sky TARGET=sky</commands>
      <description>Sky Mote Type #sky2</description>
      <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
      <commands EXPORT="discard">make clean TARGET=sky
-make hello-world.sky TARGET=sky</commands>
+make -j hello-world.sky TARGET=sky</commands>
      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.sky</firmware>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
@ -233,4 +233,3 @@ make hello-world.sky TARGET=sky</commands>
    <location_y>13</location_y>
  </plugin>
 </simconf>
-
--- 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
@ -27,7 +27,7 @@
      <description>Cooja Mote Type #1</description>
      <source>[CONTIKI_DIR]/examples/rpl-border-router/border-router.c</source>
      <commands>make TARGET=cooja clean
-make border-router.cooja TARGET=cooja</commands>
+make -j border-router.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@ -53,7 +53,7 @@ make border-router.cooja TARGET=cooja</commands>
      <description>Cooja Mote Type #2</description>
      <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
      <commands>make TARGET=cooja clean
-make hello-world.cooja TARGET=cooja</commands>
+make -j hello-world.cooja TARGET=cooja</commands>
      <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
      <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
      <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
--- a/tests/17-rpl-border-router/04-border-router-traceroute.sh
+++ b/tests/17-rpl-border-router/04-border-router-traceroute.sh
@ -17,10 +17,13 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
 JPID=$!
 sleep 20

+echo "Enabling IPv6"
+sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
+
 # Connect to the simlation
 echo "Starting tunslip6"
 make -C $CONTIKI/tools tunslip6
-make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunsliplog 2>&1 &
+make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
 MPID=$!
 echo "Waiting for network formation"
 sleep 5
@ -43,14 +46,9 @@ rm COOJA.log
 if [ $STATUS -eq 0 ] && [ $HOPS -eq $TARGETHOPS ] ; then
  printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
 else
-  # Verbose output when using CI
-  if [ "$CI" = "true" ]; then
-    echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
-    echo "==== $BASENAME.tunsliplog ====" ; cat $BASENAME.tunsliplog;
-    echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
-  else
-    echo "==== Check $BASENAME.coojalog, $BASENAME.tunsliplog, and $BASENAME.scriptlog for details ====";
-  fi;
+  echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
+  echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
+  echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;

  printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;
 fi
--- a/tests/18-native-networking/01-native-ping.sh
+++ b/tests/18-native-networking/01-native-ping.sh
@ -7,9 +7,12 @@ BASENAME=01-native-ping

 IPADDR=fd00::302:304:506:708

+echo "Enabling IPv6"
+sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
+
 # Starting Contiki-NG native node
 echo "Starting native node"
-make -C $CONTIKI/examples/hello-world
+make -C $CONTIKI/examples/hello-world > make.log 2> make.err
 sudo $CONTIKI/examples/hello-world/hello-world.native > node.log 2> node.err &
 CPID=$!
 sleep 2
@ -26,22 +29,19 @@ pgrep hello-world | sudo xargs kill -9

 if [ $STATUS -eq 0 ] ; then
  cp $BASENAME.log $BASENAME.testlog
-  printf "%-32s TEST OK\n" "$BASENAME" | tee -a $BASENAME.testlog;
+  printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
 else
-  mv $BASENAME.log $BASENAME.faillog
+  echo "==== make.log ====" ; cat make.log;
+  echo "==== make.err ====" ; cat make.err;
+  echo "==== node.log ====" ; cat node.log;
+  echo "==== node.err ====" ; cat node.err;
+  echo "==== $BASENAME.log ====" ; cat $BASENAME.log;

-  echo ""
-  echo "---- node.log"
-  cat node.log
-
-  echo ""
-  echo "---- node.err"
-  cat node.err
-
-  cp $BASENAME.log $BASENAME.faillog
-  printf "%-32s TEST FAIL\n" "$BASENAME" | tee -a $BASENAME.testlog;
+  printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;
 fi

+rm make.log
+rm make.err
 rm node.log
 rm node.err

--- a/Show More
+++ b/Show More