Skip to content

Commit 857e5d8

Browse files
authored
treewide: update links to RIOT examples (#319)
1 parent 7050968 commit 857e5d8

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from testutils.shell import ping6, lladdr, check_pktbuf
1010

1111

12-
APP = 'examples/gnrc_networking'
12+
APP = 'examples/networking/gnrc/gnrc_networking'
1313
TASK10_APP = 'tests/net/gnrc_udp'
1414
pytestmark = pytest.mark.rc_only()
1515

05-single-hop-route/test_spec05.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from testutils.shell import ping6, lladdr, check_pktbuf
88

99

10-
APP = 'examples/gnrc_networking'
10+
APP = 'examples/networking/gnrc/gnrc_networking'
1111
pytestmark = pytest.mark.rc_only()
1212

1313

08-interop/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ip-addr
8484
2023-04-14 15:23:36,735 # -- fe80::f6ce:36c6:d8d1:e340
8585
```
8686

87-
8. For the RIOT side just use [gnrc_networking](https://github.com/RIOT-OS/RIOT/tree/master/examples/gnrc_networking). Get the link-local IP address with `ifconfig`:
87+
8. For the RIOT side just use [gnrc_networking](https://github.com/RIOT-OS/RIOT/tree/master/examples/networking/gnrc/gnrc_networking). Get the link-local IP address with `ifconfig`:
8888

8989
```
9090
2023-04-14 15:11:12,614 # ifconfig
@@ -344,7 +344,7 @@ The credentials for the WiFi network will be passed on the command line.
344344
Replace `esp8266-esp-12x` with the esp* board of your choice, adjust `PORT` if needed.
345345

346346
```
347-
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/gnrc_border_router BOARD=esp<...> UPLINK=wifi WIFI_SSID=<your_ssd> WIFI_PASS=<your_password> PORT=<port> flash term
347+
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/networking/gnrc/gnrc_border_router BOARD=esp<...> UPLINK=wifi WIFI_SSID=<your_ssd> WIFI_PASS=<your_password> PORT=<port> flash term
348348
```
349349

350350
### Result
@@ -413,7 +413,7 @@ Use the `sock_dns` and `gnrc_ipv6_nib_dns` modules to enable name resolution.
413413
Replace `esp8266-esp-12x` with the esp* board of your choice, adjust `PORT` if needed.
414414

415415
```
416-
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/gnrc_networking BOARD=esp<…> PORT=<port> flash term
416+
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/networking/gnrc/gnrc_networking BOARD=esp<…> PORT=<port> flash term
417417
```
418418

419419
### Result

08-interop/test_spec08.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from testutils.shell import lladdr, ping6, GNRCUDP
1515

1616

17-
GNRC_APP = 'examples/gnrc_networking'
17+
GNRC_APP = 'examples/networking/gnrc/gnrc_networking'
1818
LWIP_APP = 'tests/pkg/lwip'
1919
pytestmark = pytest.mark.rc_only()
2020

09-coap/test_spec09.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def teardown_function(function):
7878
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
7979
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
8080
def test_task01(riot_ctrl, log_nodes):
81-
node = riot_ctrl(0, 'examples/cord_ep', Shell, port=TAP)
81+
node = riot_ctrl(0, 'examples/networking/cord/cord_ep', Shell, port=TAP)
8282

8383
node_netif, _ = lladdr(node.ifconfig_list())
8484
node.ifconfig_add(node_netif, NODE_ULA)
@@ -116,7 +116,7 @@ def test_task01(riot_ctrl, log_nodes):
116116
indirect=['nodes'],
117117
)
118118
def test_task02(riot_ctrl, start_server, expected):
119-
node = riot_ctrl(0, 'examples/gcoap', Shell, port=TAP)
119+
node = riot_ctrl(0, 'examples/networking/coap/gcoap', Shell, port=TAP)
120120

121121
node_netif, _ = lladdr(node.ifconfig_list())
122122
node.ifconfig_add(node_netif, NODE_ULA)
@@ -145,7 +145,7 @@ async def run_task02_server():
145145
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
146146
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
147147
def test_task03(riot_ctrl):
148-
node = riot_ctrl(0, 'examples/nanocoap_server', Shell, port=TAP)
148+
node = riot_ctrl(0, 'examples/networking/coap/nanocoap_server', Shell, port=TAP)
149149
host_netif = bridge(TAP)
150150

151151
# can't use shell interactions here, as there is no shell
@@ -192,7 +192,7 @@ async def client(host, block_size):
192192
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
193193
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
194194
def test_task04(riot_ctrl):
195-
node = riot_ctrl(0, 'examples/nanocoap_server', Shell, port=TAP)
195+
node = riot_ctrl(0, 'examples/networking/coap/nanocoap_server', Shell, port=TAP)
196196
host_netif = bridge(TAP)
197197

198198
# can't use shell interactions here, as there is no shell
@@ -237,7 +237,7 @@ async def client(host, block_size):
237237
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
238238
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
239239
def test_task05(riot_ctrl):
240-
node = riot_ctrl(0, 'examples/gcoap', Shell, port=TAP)
240+
node = riot_ctrl(0, 'examples/networking/coap/gcoap', Shell, port=TAP)
241241

242242
node_netif, _ = lladdr(node.ifconfig_list())
243243
node.ifconfig_add(node_netif, NODE_ULA)

10-icmpv6-error/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ hop link but not the second hop link via a native node from a Linux host.
224224

225225
$ GNRC_NETIF_NUMOF=2 USEMODULE="socket_zep netdev_tap" \
226226
CFLAGS=-DGNRC_IPV6_NIB_CONF_SLAAC=1 TERMFLAGS="-z [::]:17755 tap0" \
227-
make -C examples/gnrc_networking clean all term
227+
make -C examples/networking/gnrc/gnrc_networking clean all term
228228

229229
4. Add `beef::/64` route via TAP interface on RIOT side:
230230

10-icmpv6-error/test_spec10.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
)
3636

3737

38-
APP = 'examples/gnrc_networking'
38+
APP = 'examples/networking/gnrc/gnrc_networking'
3939
TAP = 'tap0'
4040
NETIF_PARSER = IfconfigListParser()
4141

11-lorawan/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ LoRaWAN example is fully functional
99

1010
### Testing procedure
1111

12-
Build and flash the `examples/lorawan` application with the following command
12+
Build and flash the `examples/networking/misc/lorawan` application with the following command
1313

14-
$ make BOARD=<board> DEVEUI=<device eui> APPEUI=<application eui> APPKEY=<application key> -C examples/lorawan flash term
14+
$ make BOARD=<board> DEVEUI=<device eui> APPEUI=<application eui> APPKEY=<application key> -C examples/networking/misc/lorawan flash term
1515

1616
_Note:_ The application can be tested on IoT-LAB with a device register on
1717
TheThingsNetwork backend: start an experiment with one of the st-lrwan1 boards
@@ -199,9 +199,9 @@ send/receive LoRaWAN frames.
199199

200200
### Testing procedure
201201

202-
- Build and flash the `examples/gnrc_lorawan`
202+
- Build and flash the `examples/networking/gnrc/gnrc_lorawan`
203203

204-
$ make BOARD=<board> -C examples/gnrc_lorawan flash term
204+
$ make BOARD=<board> -C examples/networking/gnrc/gnrc_lorawan flash term
205205

206206
- Configure the device EUI, application EUI, application the `ifconfig` command
207207

11-lorawan/test_spec11.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from testutils.shell import check_pktbuf
1111

1212

13-
GNRC_LORAWAN_APP = "examples/gnrc_lorawan"
14-
LORAWAN_APP = "examples/lorawan"
13+
GNRC_LORAWAN_APP = "examples/networking/gnrc/gnrc_lorawan"
14+
LORAWAN_APP = "examples/networking/misc/lorawan"
1515
SEMTECH_LORAMAC_APP = "tests/pkg/semtech-loramac"
1616
pytestmark = pytest.mark.rc_only()
1717

testutils/shell.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class GNRCUDPClientSendParser(ShellInteractionParser):
2727
"""
2828
Shell interaction parser for
2929
30-
- $RIOTBASE/examples/gnrc_networking
30+
- $RIOTBASE/examples/networking/gnrc/gnrc_networking
3131
- $RIOTBASE/tests/net/gnrc_udp.
3232
3333
As the `udp` shell command is application specific, a central
@@ -78,7 +78,7 @@ class GNRCLoRaWANSend(ShellInteraction):
7878
"""
7979
Shell interaction for
8080
81-
- $RIOTBASE/examples/gnrc_lorawan
81+
- $RIOTBASE/examples/networking/gnrc/gnrc_lorawan
8282
8383
As the `send` shell command is application specific, a central
8484
ShellInteraction in `riotctrl_shell` does not make much sense
@@ -99,7 +99,7 @@ class GNRCUDP(ShellInteraction):
9999
"""
100100
Shell interaction for
101101
102-
- $RIOTBASE/examples/gnrc_networking
102+
- $RIOTBASE/examples/networking/gnrc/gnrc_networking
103103
- $RIOTBASE/tests/net/gnrc_udp.
104104
105105
As the `udp` shell command is application specific, a central

0 commit comments

Comments
 (0)