Merge pull request RIOT-OS#283 from aabadie/test_path

Fix paths to RIOT test applications

03-single-hop-ipv6-icmp/test_spec03.py

@@ -12,7 +12,7 @@
 from testutils.shell import ping6, lladdr, check_pktbuf
 
 
-APP = 'tests/gnrc_udp'
+APP = 'tests/net/gnrc_udp'
 TASK05_NODES = 11
 pytestmark = pytest.mark.rc_only()
 

04-single-hop-6lowpan-icmp/example_test_guide.md

@@ -5,10 +5,10 @@ _The following is a possible way to run the tests, this is just an example_
 _One can use IoT-LAB for everything but the remote-revb boards_
 1. Get 2 of the following boards: `samr21-xpro`, `iotlab-m3`
 2. Get the following boards:`remote-revb`, `arduino-zero` with `xbee` module
-3. `cd ${RIOTBASE}/tests/gnrc_udp`
+3. `cd ${RIOTBASE}/tests/net/gnrc_udp`
 4. Setup a terminal for each board _(tmux is your friend)_
 5. Find the serial numbers and ports with `ls /dev/serial/by-id/` or with
-`make -C tests/gnrc_udp list-ttys`
+`make -C tests/net/gnrc_udp list-ttys`
 6. For the samr21 terminals use the following to setup the env
 _eg_ `export BOARD=samr21-xpro && export SERIAL=<SAMR_SERIAL> && export PORT=<SAMR_PORT>`
 

04-single-hop-6lowpan-icmp/test_spec04.py

@@ -10,7 +10,7 @@
 
 
 APP = 'examples/gnrc_networking'
-TASK10_APP = 'tests/gnrc_udp'
+TASK10_APP = 'tests/net/gnrc_udp'
 pytestmark = pytest.mark.rc_only()
 
 

06-single-hop-udp/test_spec06.py

@@ -7,7 +7,7 @@
 from testutils.shell import lladdr, GNRCUDP, check_pktbuf
 
 
-APP = 'tests/gnrc_udp'
+APP = 'tests/net/gnrc_udp'
 pytestmark = pytest.mark.rc_only()
 
 

07-multi-hop/example_test_guide.md

@@ -8,9 +8,9 @@ node1 <-> node2 <-> node3 <-> node4_
 
 # Task 1 and 2 Setup
 1. First build the firmware for all the nodes
-`USEMODULE=shell_cmd_gnrc_pktbuf make -C tests/gnrc_udp/ BOARD=iotlab-m3 clean all`
+`USEMODULE=shell_cmd_gnrc_pktbuf make -C tests/net/gnrc_udp/ BOARD=iotlab-m3 clean all`
 1. Open 4 instances of nodes physically close together
-`make -C tests/gnrc_udp/ BOARD=iotlab-m3 IOTLAB_NODE=<iotlab id> flash-only term`
+`make -C tests/net/gnrc_udp/ BOARD=iotlab-m3 IOTLAB_NODE=<iotlab id> flash-only term`
 1. On each end of the nodes add a global IP address (ie. node1:
    `ifconfig 5 add abcd::1` and node 4: `ifconfig 5 add abcd::2`)
 1. Add the routing for both ways:
@@ -58,9 +58,9 @@ No leaks in the packet buffer (check with `pktbuf`).
 
 # Task 3 and 4 Setup
 1. First build the firmware for all the nodes
-`USEMODULE="l2filter_whitelist shell_cmd_gnrc_pktbuf" BOARD=iotlab-m3 make -C tests/gnrc_udp/ clean all`
+`USEMODULE="l2filter_whitelist shell_cmd_gnrc_pktbuf" BOARD=iotlab-m3 make -C tests/net/gnrc_udp/ clean all`
 1. Flash all nodes with with the l2filter_whitelist module firmware
-`BOARD=iotlab-m3 IOTLAB_NODE=<iotlab id> make -C tests/gnrc_udp/ flash-only term`
+`BOARD=iotlab-m3 IOTLAB_NODE=<iotlab id> make -C tests/net/gnrc_udp/ flash-only term`
 1. Setup the l2filter_whitelist addresses
     - Node 1: `ifconfig 5 l2filter add <MAC addr of node 2>`
     - Node 2: `ifconfig 5 l2filter add <MAC addr of node 1>` and

07-multi-hop/test_spec07.py

@@ -8,7 +8,7 @@
 from testutils.shell import lladdr, global_addr, ping6, GNRCUDP, PARSERS, check_pktbuf
 
 
-APP = 'tests/gnrc_udp'
+APP = 'tests/net/gnrc_udp'
 TO_ADDR = "affe::1"  # address for the first statically routed node
 FROM_ADDR = "beef::1"  # address for the last statically routed node
 pytestmark = pytest.mark.rc_only()

08-interop/test_spec08.py

@@ -13,7 +13,7 @@
 
 
 GNRC_APP = 'examples/gnrc_networking'
-LWIP_APP = 'tests/lwip'
+LWIP_APP = 'tests/pkg/lwip'
 pytestmark = pytest.mark.rc_only()
 
 

11-lorawan/README.md

@@ -33,9 +33,9 @@ OTAA join procedure and uplink with datarates indexes 0, 3, 5 (others are option
 
 ### Testing procedure
 
-- Build and flash the `tests/pkg_semtech-loramac`
+- Build and flash the `tests/pkg/semtech-loramac`
 
-      $ make BOARD=<board> -C tests/pkg_semtech-loramac flash term
+      $ make BOARD=<board> -C tests/pkg/semtech-loramac flash term
 
 - Configure the devive EUI, application EUI, application key
 
@@ -78,9 +78,9 @@ ABP join procedure and uplinks with datarates indexes 0, 3, 5 (others are option
 
 ### Testing procedure
 
-- Build and flash the `tests/pkg_semtech-loramac`
+- Build and flash the `tests/pkg/semtech-loramac`
 
-      $ make BOARD=<board> -C tests/pkg_semtech-loramac flash term
+      $ make BOARD=<board> -C tests/pkg/semtech-loramac flash term
 
 - Configure the devive EUI, application EUI, application key
 
@@ -137,9 +137,9 @@ Device parameters (DevEUI, AppEUI, AppKey, etc) persistence works.
 This procedure can only be performed on a board with EEPROM storage. Use the
 ST B-L072Z-LRWAN1 or any other STM32 L0/L1 Nucleo 64 with an Mbed LoRa shield.
 
-- Build and flash the `tests/pkg_semtech-loramac`
+- Build and flash the `tests/pkg/semtech-loramac`
 
-      $ make BOARD=<board> -C tests/pkg_semtech-loramac flash term
+      $ make BOARD=<board> -C tests/pkg/semtech-loramac flash term
 
 - Erase any previously stored parameters:
 

11-lorawan/test_spec11.py

@@ -12,7 +12,7 @@
 
 GNRC_LORAWAN_APP = "examples/gnrc_lorawan"
 LORAWAN_APP = "examples/lorawan"
-SEMTECH_LORAMAC_APP = "tests/pkg_semtech-loramac"
+SEMTECH_LORAMAC_APP = "tests/pkg/semtech-loramac"
 pytestmark = pytest.mark.rc_only()
 
 APP_PAYLOAD = "This is RIOT!"

testutils/shell.py

@@ -28,7 +28,7 @@ class GNRCUDPClientSendParser(ShellInteractionParser):
     Shell interaction parser for
 
     - $RIOTBASE/examples/gnrc_networking
-    - $RIOTBASE/tests/gnrc_udp.
+    - $RIOTBASE/tests/net/gnrc_udp.
 
     As the `udp` shell command is application specific, a central
     ShellInteraction in `riotctrl_shell` does not make much sense
@@ -100,7 +100,7 @@ class GNRCUDP(ShellInteraction):
     Shell interaction for
 
     - $RIOTBASE/examples/gnrc_networking
-    - $RIOTBASE/tests/gnrc_udp.
+    - $RIOTBASE/tests/net/gnrc_udp.
 
     As the `udp` shell command is application specific, a central
     ShellInteraction in `riotctrl_shell` does not make much sense