diff --git a/.gitignore b/.gitignore index 82b0a2806..a9a1673b3 100644 --- a/.gitignore +++ b/.gitignore @@ -81,7 +81,7 @@ platform/galileo/bsp/grub/bin/ *.prg *.dsc -#regression tests artifacts +#test artifacts *.testlog *.log.prog *.report @@ -90,8 +90,8 @@ summary *.runerr *.runlog *.faillog -regression-tests/[0-9][0-9]-*/report -regression-tests/[0-9][0-9]-*/org/ +tests/[0-9][0-9]-*/report +tests/[0-9][0-9]-*/org/ # cscope files cscope.* diff --git a/.travis.yml b/.travis.yml index d21db11e1..0327d41f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,15 +77,15 @@ before_script: fi script: - ## regression-tests/Makefile handles most of generic logic - - "make -C regression-tests/??-$BUILD_TYPE RUNALL=true summary" + ## 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 regression-tests/??-$BUILD_TYPE/*.testlog" + - "[ ${BUILD_CATEGORY:-0} = sim ] && tail tests/??-$BUILD_TYPE/*.testlog" ## Print a basic summary - - "echo 'Summary:'; cat regression-tests/??-$BUILD_TYPE/summary" - - "FAILS=`grep -c ' FAIL ' regression-tests/??-$BUILD_TYPE/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 $?" diff --git a/regression-tests/00-doxygen/Makefile b/tests/00-doxygen/Makefile similarity index 100% rename from regression-tests/00-doxygen/Makefile rename to tests/00-doxygen/Makefile diff --git a/regression-tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile similarity index 100% rename from regression-tests/01-compile-base/Makefile rename to tests/01-compile-base/Makefile diff --git a/regression-tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile similarity index 100% rename from regression-tests/02-compile-arm-ports/Makefile rename to tests/02-compile-arm-ports/Makefile diff --git a/regression-tests/03-compile-nxp-ports/Makefile b/tests/03-compile-nxp-ports/Makefile similarity index 100% rename from regression-tests/03-compile-nxp-ports/Makefile rename to tests/03-compile-nxp-ports/Makefile diff --git a/regression-tests/04-compile-nrf52-ports/Makefile b/tests/04-compile-nrf52-ports/Makefile similarity index 100% rename from regression-tests/04-compile-nrf52-ports/Makefile rename to tests/04-compile-nrf52-ports/Makefile diff --git a/regression-tests/05-compile-tools/Makefile b/tests/05-compile-tools/Makefile similarity index 100% rename from regression-tests/05-compile-tools/Makefile rename to tests/05-compile-tools/Makefile diff --git a/regression-tests/07-base/02-hello-world-sky.csc b/tests/07-base/02-hello-world-sky.csc similarity index 100% rename from regression-tests/07-base/02-hello-world-sky.csc rename to tests/07-base/02-hello-world-sky.csc diff --git a/regression-tests/07-base/04-ringbufindex.csc b/tests/07-base/04-ringbufindex.csc similarity index 100% rename from regression-tests/07-base/04-ringbufindex.csc rename to tests/07-base/04-ringbufindex.csc diff --git a/regression-tests/07-base/Makefile b/tests/07-base/Makefile similarity index 100% rename from regression-tests/07-base/Makefile rename to tests/07-base/Makefile diff --git a/regression-tests/07-base/code/Makefile b/tests/07-base/code/Makefile similarity index 100% rename from regression-tests/07-base/code/Makefile rename to tests/07-base/code/Makefile diff --git a/regression-tests/07-base/code/project-conf.h b/tests/07-base/code/project-conf.h similarity index 100% rename from regression-tests/07-base/code/project-conf.h rename to tests/07-base/code/project-conf.h diff --git a/regression-tests/07-base/code/test-ringbufindex.c b/tests/07-base/code/test-ringbufindex.c similarity index 100% rename from regression-tests/07-base/code/test-ringbufindex.c rename to tests/07-base/code/test-ringbufindex.c diff --git a/regression-tests/07-base/hello-world.js b/tests/07-base/hello-world.js similarity index 100% rename from regression-tests/07-base/hello-world.js rename to tests/07-base/hello-world.js diff --git a/regression-tests/07-base/js/04-ringbufindex.js b/tests/07-base/js/04-ringbufindex.js similarity index 100% rename from regression-tests/07-base/js/04-ringbufindex.js rename to tests/07-base/js/04-ringbufindex.js diff --git a/regression-tests/08-ipv6/01-cooja-ipv6-udp.csc b/tests/08-ipv6/01-cooja-ipv6-udp.csc similarity index 100% rename from regression-tests/08-ipv6/01-cooja-ipv6-udp.csc rename to tests/08-ipv6/01-cooja-ipv6-udp.csc diff --git a/regression-tests/08-ipv6/02-sky-slip-radio.csc b/tests/08-ipv6/02-sky-slip-radio.csc similarity index 100% rename from regression-tests/08-ipv6/02-sky-slip-radio.csc rename to tests/08-ipv6/02-sky-slip-radio.csc diff --git a/regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc b/tests/08-ipv6/04-cooja-ipv64-http-socket.csc similarity index 100% rename from regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc rename to tests/08-ipv6/04-cooja-ipv64-http-socket.csc diff --git a/regression-tests/08-ipv6/17-cooja-multicast-11-hops.csc b/tests/08-ipv6/17-cooja-multicast-11-hops.csc similarity index 100% rename from regression-tests/08-ipv6/17-cooja-multicast-11-hops.csc rename to tests/08-ipv6/17-cooja-multicast-11-hops.csc diff --git a/regression-tests/08-ipv6/18-cooja-multicast-31-hops.csc b/tests/08-ipv6/18-cooja-multicast-31-hops.csc similarity index 100% rename from regression-tests/08-ipv6/18-cooja-multicast-31-hops.csc rename to tests/08-ipv6/18-cooja-multicast-31-hops.csc diff --git a/regression-tests/08-ipv6/19-cooja-rpl-tsch.csc b/tests/08-ipv6/19-cooja-rpl-tsch.csc similarity index 100% rename from regression-tests/08-ipv6/19-cooja-rpl-tsch.csc rename to tests/08-ipv6/19-cooja-rpl-tsch.csc diff --git a/regression-tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc b/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc similarity index 100% rename from regression-tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc rename to tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc diff --git a/regression-tests/08-ipv6/21-cooja-rpl-tsch-security.csc b/tests/08-ipv6/21-cooja-rpl-tsch-security.csc similarity index 100% rename from regression-tests/08-ipv6/21-cooja-rpl-tsch-security.csc rename to tests/08-ipv6/21-cooja-rpl-tsch-security.csc diff --git a/regression-tests/08-ipv6/Makefile b/tests/08-ipv6/Makefile similarity index 100% rename from regression-tests/08-ipv6/Makefile rename to tests/08-ipv6/Makefile diff --git a/regression-tests/08-ipv6/code-slip-radio/Makefile b/tests/08-ipv6/code-slip-radio/Makefile similarity index 100% rename from regression-tests/08-ipv6/code-slip-radio/Makefile rename to tests/08-ipv6/code-slip-radio/Makefile diff --git a/regression-tests/08-ipv6/code-slip-radio/project-conf.h b/tests/08-ipv6/code-slip-radio/project-conf.h similarity index 100% rename from regression-tests/08-ipv6/code-slip-radio/project-conf.h rename to tests/08-ipv6/code-slip-radio/project-conf.h diff --git a/regression-tests/08-ipv6/code-slip-radio/wait-dag.c b/tests/08-ipv6/code-slip-radio/wait-dag.c similarity index 100% rename from regression-tests/08-ipv6/code-slip-radio/wait-dag.c rename to tests/08-ipv6/code-slip-radio/wait-dag.c diff --git a/regression-tests/08-ipv6/code/receiver/Makefile b/tests/08-ipv6/code/receiver/Makefile similarity index 100% rename from regression-tests/08-ipv6/code/receiver/Makefile rename to tests/08-ipv6/code/receiver/Makefile diff --git a/regression-tests/08-ipv6/code/receiver/project-conf.h b/tests/08-ipv6/code/receiver/project-conf.h similarity index 100% rename from regression-tests/08-ipv6/code/receiver/project-conf.h rename to tests/08-ipv6/code/receiver/project-conf.h diff --git a/regression-tests/08-ipv6/code/receiver/udp-receiver.c b/tests/08-ipv6/code/receiver/udp-receiver.c similarity index 100% rename from regression-tests/08-ipv6/code/receiver/udp-receiver.c rename to tests/08-ipv6/code/receiver/udp-receiver.c diff --git a/regression-tests/08-ipv6/code/sender/Makefile b/tests/08-ipv6/code/sender/Makefile similarity index 100% rename from regression-tests/08-ipv6/code/sender/Makefile rename to tests/08-ipv6/code/sender/Makefile diff --git a/regression-tests/08-ipv6/code/sender/project-conf.h b/tests/08-ipv6/code/sender/project-conf.h similarity index 100% rename from regression-tests/08-ipv6/code/sender/project-conf.h rename to tests/08-ipv6/code/sender/project-conf.h diff --git a/regression-tests/08-ipv6/code/sender/udp-sender.c b/tests/08-ipv6/code/sender/udp-sender.c similarity index 100% rename from regression-tests/08-ipv6/code/sender/udp-sender.c rename to tests/08-ipv6/code/sender/udp-sender.c diff --git a/regression-tests/08-ipv6/code/sender/unicast-sender.c b/tests/08-ipv6/code/sender/unicast-sender.c similarity index 100% rename from regression-tests/08-ipv6/code/sender/unicast-sender.c rename to tests/08-ipv6/code/sender/unicast-sender.c diff --git a/regression-tests/08-ipv6/fragmentation-should-receive-all.js b/tests/08-ipv6/fragmentation-should-receive-all.js similarity index 100% rename from regression-tests/08-ipv6/fragmentation-should-receive-all.js rename to tests/08-ipv6/fragmentation-should-receive-all.js diff --git a/regression-tests/08-ipv6/fragmentation-should-receive-none.js b/tests/08-ipv6/fragmentation-should-receive-none.js similarity index 100% rename from regression-tests/08-ipv6/fragmentation-should-receive-none.js rename to tests/08-ipv6/fragmentation-should-receive-none.js diff --git a/regression-tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc b/tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc similarity index 100% rename from regression-tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc rename to tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc diff --git a/regression-tests/13-ieee802154/01-panid-handling.csc b/tests/13-ieee802154/01-panid-handling.csc similarity index 100% rename from regression-tests/13-ieee802154/01-panid-handling.csc rename to tests/13-ieee802154/01-panid-handling.csc diff --git a/regression-tests/13-ieee802154/02-tsch-packet-create.csc b/tests/13-ieee802154/02-tsch-packet-create.csc similarity index 100% rename from regression-tests/13-ieee802154/02-tsch-packet-create.csc rename to tests/13-ieee802154/02-tsch-packet-create.csc diff --git a/regression-tests/13-ieee802154/03-tsch-flush-nbr-queue.csc b/tests/13-ieee802154/03-tsch-flush-nbr-queue.csc similarity index 100% rename from regression-tests/13-ieee802154/03-tsch-flush-nbr-queue.csc rename to tests/13-ieee802154/03-tsch-flush-nbr-queue.csc diff --git a/regression-tests/13-ieee802154/Makefile b/tests/13-ieee802154/Makefile similarity index 100% rename from regression-tests/13-ieee802154/Makefile rename to tests/13-ieee802154/Makefile diff --git a/regression-tests/13-ieee802154/README.md b/tests/13-ieee802154/README.md similarity index 100% rename from regression-tests/13-ieee802154/README.md rename to tests/13-ieee802154/README.md diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile b/tests/13-ieee802154/code-flush-nbr-queue/Makefile similarity index 100% rename from regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile rename to tests/13-ieee802154/code-flush-nbr-queue/Makefile diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/common.c b/tests/13-ieee802154/code-flush-nbr-queue/common.c similarity index 100% rename from regression-tests/13-ieee802154/code-flush-nbr-queue/common.c rename to tests/13-ieee802154/code-flush-nbr-queue/common.c diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/common.h b/tests/13-ieee802154/code-flush-nbr-queue/common.h similarity index 100% rename from regression-tests/13-ieee802154/code-flush-nbr-queue/common.h rename to tests/13-ieee802154/code-flush-nbr-queue/common.h diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h b/tests/13-ieee802154/code-flush-nbr-queue/project-conf.h similarity index 100% rename from regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h rename to tests/13-ieee802154/code-flush-nbr-queue/project-conf.h diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c b/tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c similarity index 100% rename from regression-tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c rename to tests/13-ieee802154/code-flush-nbr-queue/test-flush-nbr-queue.c diff --git a/regression-tests/13-ieee802154/code/Makefile b/tests/13-ieee802154/code/Makefile similarity index 100% rename from regression-tests/13-ieee802154/code/Makefile rename to tests/13-ieee802154/code/Makefile diff --git a/regression-tests/13-ieee802154/code/project-conf.h b/tests/13-ieee802154/code/project-conf.h similarity index 100% rename from regression-tests/13-ieee802154/code/project-conf.h rename to tests/13-ieee802154/code/project-conf.h diff --git a/regression-tests/13-ieee802154/code/project-tsch-conf.h b/tests/13-ieee802154/code/project-tsch-conf.h similarity index 100% rename from regression-tests/13-ieee802154/code/project-tsch-conf.h rename to tests/13-ieee802154/code/project-tsch-conf.h diff --git a/regression-tests/13-ieee802154/code/test-panid-handling.c b/tests/13-ieee802154/code/test-panid-handling.c similarity index 100% rename from regression-tests/13-ieee802154/code/test-panid-handling.c rename to tests/13-ieee802154/code/test-panid-handling.c diff --git a/regression-tests/13-ieee802154/code/test-tsch-packet.c b/tests/13-ieee802154/code/test-tsch-packet.c similarity index 100% rename from regression-tests/13-ieee802154/code/test-tsch-packet.c rename to tests/13-ieee802154/code/test-tsch-packet.c diff --git a/regression-tests/13-ieee802154/js/01-panid-handling.js b/tests/13-ieee802154/js/01-panid-handling.js similarity index 100% rename from regression-tests/13-ieee802154/js/01-panid-handling.js rename to tests/13-ieee802154/js/01-panid-handling.js diff --git a/regression-tests/13-ieee802154/js/02-tsch-packet-create.js b/tests/13-ieee802154/js/02-tsch-packet-create.js similarity index 100% rename from regression-tests/13-ieee802154/js/02-tsch-packet-create.js rename to tests/13-ieee802154/js/02-tsch-packet-create.js diff --git a/regression-tests/13-ieee802154/js/03-tsch-flush-nbr-queue.js b/tests/13-ieee802154/js/03-tsch-flush-nbr-queue.js similarity index 100% rename from regression-tests/13-ieee802154/js/03-tsch-flush-nbr-queue.js rename to tests/13-ieee802154/js/03-tsch-flush-nbr-queue.js diff --git a/regression-tests/14-rpl-lite/01-rpl-up-route.csc b/tests/14-rpl-lite/01-rpl-up-route.csc similarity index 100% rename from regression-tests/14-rpl-lite/01-rpl-up-route.csc rename to tests/14-rpl-lite/01-rpl-up-route.csc diff --git a/regression-tests/14-rpl-lite/03-rpl-28-hours.csc b/tests/14-rpl-lite/03-rpl-28-hours.csc similarity index 100% rename from regression-tests/14-rpl-lite/03-rpl-28-hours.csc rename to tests/14-rpl-lite/03-rpl-28-hours.csc diff --git a/regression-tests/14-rpl-lite/05-rpl-up-and-down-routes.csc b/tests/14-rpl-lite/05-rpl-up-and-down-routes.csc similarity index 100% rename from regression-tests/14-rpl-lite/05-rpl-up-and-down-routes.csc rename to tests/14-rpl-lite/05-rpl-up-and-down-routes.csc diff --git a/regression-tests/14-rpl-lite/06-rpl-temporary-root-loss.csc b/tests/14-rpl-lite/06-rpl-temporary-root-loss.csc similarity index 100% rename from regression-tests/14-rpl-lite/06-rpl-temporary-root-loss.csc rename to tests/14-rpl-lite/06-rpl-temporary-root-loss.csc diff --git a/regression-tests/14-rpl-lite/07-rpl-random-rearrangement.csc b/tests/14-rpl-lite/07-rpl-random-rearrangement.csc similarity index 100% rename from regression-tests/14-rpl-lite/07-rpl-random-rearrangement.csc rename to tests/14-rpl-lite/07-rpl-random-rearrangement.csc diff --git a/regression-tests/14-rpl-lite/08-rpl-dao-route-loss-0.csc b/tests/14-rpl-lite/08-rpl-dao-route-loss-0.csc similarity index 100% rename from regression-tests/14-rpl-lite/08-rpl-dao-route-loss-0.csc rename to tests/14-rpl-lite/08-rpl-dao-route-loss-0.csc diff --git a/regression-tests/14-rpl-lite/08-rpl-dao-route-loss-1.csc b/tests/14-rpl-lite/08-rpl-dao-route-loss-1.csc similarity index 100% rename from regression-tests/14-rpl-lite/08-rpl-dao-route-loss-1.csc rename to tests/14-rpl-lite/08-rpl-dao-route-loss-1.csc diff --git a/regression-tests/14-rpl-lite/08-rpl-dao-route-loss-2.csc b/tests/14-rpl-lite/08-rpl-dao-route-loss-2.csc similarity index 100% rename from regression-tests/14-rpl-lite/08-rpl-dao-route-loss-2.csc rename to tests/14-rpl-lite/08-rpl-dao-route-loss-2.csc diff --git a/regression-tests/14-rpl-lite/08-rpl-dao-route-loss-3.csc b/tests/14-rpl-lite/08-rpl-dao-route-loss-3.csc similarity index 100% rename from regression-tests/14-rpl-lite/08-rpl-dao-route-loss-3.csc rename to tests/14-rpl-lite/08-rpl-dao-route-loss-3.csc diff --git a/regression-tests/14-rpl-lite/08-rpl-dao-route-loss-4.csc b/tests/14-rpl-lite/08-rpl-dao-route-loss-4.csc similarity index 100% rename from regression-tests/14-rpl-lite/08-rpl-dao-route-loss-4.csc rename to tests/14-rpl-lite/08-rpl-dao-route-loss-4.csc diff --git a/regression-tests/14-rpl-lite/08-rpl-dao-route-loss-5.csc b/tests/14-rpl-lite/08-rpl-dao-route-loss-5.csc similarity index 100% rename from regression-tests/14-rpl-lite/08-rpl-dao-route-loss-5.csc rename to tests/14-rpl-lite/08-rpl-dao-route-loss-5.csc diff --git a/regression-tests/14-rpl-lite/09-rpl-probing.csc b/tests/14-rpl-lite/09-rpl-probing.csc similarity index 100% rename from regression-tests/14-rpl-lite/09-rpl-probing.csc rename to tests/14-rpl-lite/09-rpl-probing.csc diff --git a/regression-tests/14-rpl-lite/Makefile b/tests/14-rpl-lite/Makefile similarity index 100% rename from regression-tests/14-rpl-lite/Makefile rename to tests/14-rpl-lite/Makefile diff --git a/regression-tests/14-rpl-lite/code/Makefile b/tests/14-rpl-lite/code/Makefile similarity index 100% rename from regression-tests/14-rpl-lite/code/Makefile rename to tests/14-rpl-lite/code/Makefile diff --git a/regression-tests/14-rpl-lite/code/project-conf.h b/tests/14-rpl-lite/code/project-conf.h similarity index 100% rename from regression-tests/14-rpl-lite/code/project-conf.h rename to tests/14-rpl-lite/code/project-conf.h diff --git a/regression-tests/14-rpl-lite/code/receiver-node.c b/tests/14-rpl-lite/code/receiver-node.c similarity index 100% rename from regression-tests/14-rpl-lite/code/receiver-node.c rename to tests/14-rpl-lite/code/receiver-node.c diff --git a/regression-tests/14-rpl-lite/code/root-node.c b/tests/14-rpl-lite/code/root-node.c similarity index 100% rename from regression-tests/14-rpl-lite/code/root-node.c rename to tests/14-rpl-lite/code/root-node.c diff --git a/regression-tests/14-rpl-lite/code/sender-node.c b/tests/14-rpl-lite/code/sender-node.c similarity index 100% rename from regression-tests/14-rpl-lite/code/sender-node.c rename to tests/14-rpl-lite/code/sender-node.c diff --git a/regression-tests/15-rpl/01-rpl-up-route.csc b/tests/15-rpl/01-rpl-up-route.csc similarity index 100% rename from regression-tests/15-rpl/01-rpl-up-route.csc rename to tests/15-rpl/01-rpl-up-route.csc diff --git a/regression-tests/15-rpl/02-rpl-root-reboot.csc b/tests/15-rpl/02-rpl-root-reboot.csc similarity index 100% rename from regression-tests/15-rpl/02-rpl-root-reboot.csc rename to tests/15-rpl/02-rpl-root-reboot.csc diff --git a/regression-tests/15-rpl/03-rpl-28-hours.csc b/tests/15-rpl/03-rpl-28-hours.csc similarity index 100% rename from regression-tests/15-rpl/03-rpl-28-hours.csc rename to tests/15-rpl/03-rpl-28-hours.csc diff --git a/regression-tests/15-rpl/05-rpl-up-and-down-routes.csc b/tests/15-rpl/05-rpl-up-and-down-routes.csc similarity index 100% rename from regression-tests/15-rpl/05-rpl-up-and-down-routes.csc rename to tests/15-rpl/05-rpl-up-and-down-routes.csc diff --git a/regression-tests/15-rpl/06-rpl-temporary-root-loss.csc b/tests/15-rpl/06-rpl-temporary-root-loss.csc similarity index 100% rename from regression-tests/15-rpl/06-rpl-temporary-root-loss.csc rename to tests/15-rpl/06-rpl-temporary-root-loss.csc diff --git a/regression-tests/15-rpl/07-rpl-random-rearrangement.csc b/tests/15-rpl/07-rpl-random-rearrangement.csc similarity index 100% rename from regression-tests/15-rpl/07-rpl-random-rearrangement.csc rename to tests/15-rpl/07-rpl-random-rearrangement.csc diff --git a/regression-tests/15-rpl/08-rpl-dao-route-loss-0.csc b/tests/15-rpl/08-rpl-dao-route-loss-0.csc similarity index 100% rename from regression-tests/15-rpl/08-rpl-dao-route-loss-0.csc rename to tests/15-rpl/08-rpl-dao-route-loss-0.csc diff --git a/regression-tests/15-rpl/08-rpl-dao-route-loss-1.csc b/tests/15-rpl/08-rpl-dao-route-loss-1.csc similarity index 100% rename from regression-tests/15-rpl/08-rpl-dao-route-loss-1.csc rename to tests/15-rpl/08-rpl-dao-route-loss-1.csc diff --git a/regression-tests/15-rpl/08-rpl-dao-route-loss-2.csc b/tests/15-rpl/08-rpl-dao-route-loss-2.csc similarity index 100% rename from regression-tests/15-rpl/08-rpl-dao-route-loss-2.csc rename to tests/15-rpl/08-rpl-dao-route-loss-2.csc diff --git a/regression-tests/15-rpl/08-rpl-dao-route-loss-3.csc b/tests/15-rpl/08-rpl-dao-route-loss-3.csc similarity index 100% rename from regression-tests/15-rpl/08-rpl-dao-route-loss-3.csc rename to tests/15-rpl/08-rpl-dao-route-loss-3.csc diff --git a/regression-tests/15-rpl/08-rpl-dao-route-loss-4.csc b/tests/15-rpl/08-rpl-dao-route-loss-4.csc similarity index 100% rename from regression-tests/15-rpl/08-rpl-dao-route-loss-4.csc rename to tests/15-rpl/08-rpl-dao-route-loss-4.csc diff --git a/regression-tests/15-rpl/08-rpl-dao-route-loss-5.csc b/tests/15-rpl/08-rpl-dao-route-loss-5.csc similarity index 100% rename from regression-tests/15-rpl/08-rpl-dao-route-loss-5.csc rename to tests/15-rpl/08-rpl-dao-route-loss-5.csc diff --git a/regression-tests/15-rpl/09-rpl-probing.csc b/tests/15-rpl/09-rpl-probing.csc similarity index 100% rename from regression-tests/15-rpl/09-rpl-probing.csc rename to tests/15-rpl/09-rpl-probing.csc diff --git a/regression-tests/15-rpl/10-rpl-multi-dodag.csc b/tests/15-rpl/10-rpl-multi-dodag.csc similarity index 100% rename from regression-tests/15-rpl/10-rpl-multi-dodag.csc rename to tests/15-rpl/10-rpl-multi-dodag.csc diff --git a/regression-tests/15-rpl/Makefile b/tests/15-rpl/Makefile similarity index 100% rename from regression-tests/15-rpl/Makefile rename to tests/15-rpl/Makefile diff --git a/regression-tests/15-rpl/code/Makefile b/tests/15-rpl/code/Makefile similarity index 100% rename from regression-tests/15-rpl/code/Makefile rename to tests/15-rpl/code/Makefile diff --git a/regression-tests/15-rpl/code/project-conf.h b/tests/15-rpl/code/project-conf.h similarity index 100% rename from regression-tests/15-rpl/code/project-conf.h rename to tests/15-rpl/code/project-conf.h diff --git a/regression-tests/15-rpl/code/receiver-node.c b/tests/15-rpl/code/receiver-node.c similarity index 100% rename from regression-tests/15-rpl/code/receiver-node.c rename to tests/15-rpl/code/receiver-node.c diff --git a/regression-tests/15-rpl/code/root-node.c b/tests/15-rpl/code/root-node.c similarity index 100% rename from regression-tests/15-rpl/code/root-node.c rename to tests/15-rpl/code/root-node.c diff --git a/regression-tests/15-rpl/code/sender-node.c b/tests/15-rpl/code/sender-node.c similarity index 100% rename from regression-tests/15-rpl/code/sender-node.c rename to tests/15-rpl/code/sender-node.c diff --git a/regression-tests/Makefile b/tests/Makefile similarity index 100% rename from regression-tests/Makefile rename to tests/Makefile diff --git a/regression-tests/Makefile.compile-test b/tests/Makefile.compile-test similarity index 100% rename from regression-tests/Makefile.compile-test rename to tests/Makefile.compile-test diff --git a/regression-tests/Makefile.simulation-test b/tests/Makefile.simulation-test similarity index 95% rename from regression-tests/Makefile.simulation-test rename to tests/Makefile.simulation-test index 9995eeea8..bbd54703c 100644 --- a/regression-tests/Makefile.simulation-test +++ b/tests/Makefile.simulation-test @@ -57,7 +57,7 @@ RUNALL=false endif %.testlog: %.csc cooja - @$(CONTIKI)/regression-tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" $(RANDOMSEED) + @$(CONTIKI)/tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" $(RANDOMSEED) clean: @rm -f $(TESTLOGS) $(LOGS) $(FAILLOGS) COOJA.log COOJA.testlog \ diff --git a/regression-tests/scan_build/Makefile b/tests/scan_build/Makefile similarity index 100% rename from regression-tests/scan_build/Makefile rename to tests/scan_build/Makefile diff --git a/regression-tests/simexec.sh b/tests/simexec.sh similarity index 100% rename from regression-tests/simexec.sh rename to tests/simexec.sh