wip

08-interop/compile_zephyr.sh

@@ -8,40 +8,19 @@ cd /tmp
 mkdir -p zephyrproject
 
 docker run \
+    --privileged \
     -e LOCAL_UID=$(id -u $USER) \
     -e LOCAL_GID=$(id -g $USER) \
-    -v zephyrproject:/workdir \
+    -v  /tmp/zephyrproject:/workdir \
     docker.io/zephyrprojectrtos/zephyr-build:latest \
     /bin/bash -c '
 
-west init 
+west init
 west update cmsis hal_atmel
 west zephyr-export
 pip install -r ~/zephyrproject/zephyr/scripts/requirements.txt
 
 cd /workdir/zephyr
-echo "CONFIG_CPP=n
-
-CONFIG_NET_PKT_RX_COUNT=5
-CONFIG_NET_PKT_TX_COUNT=5
-CONFIG_NET_BUF_RX_COUNT=5
-CONFIG_NET_BUF_TX_COUNT=5
-CONFIG_NET_MAX_CONTEXTS=2
-CONFIG_NET_MAX_CONN=1
-CONFIG_NET_MAX_ROUTES=1
-CONFIG_NET_MAX_NEXTHOPS=1
-
-CONFIG_SHELL_STACK_SIZE=512
-CONFIG_SHELL_CMD_BUFF_SIZE=32
-CONFIG_SHELL_ARGC_MAX=6
-CONFIG_SHELL_HISTORY_BUFFER=4
-
-CONFIG_LOG_MODE_MINIMAL=y
-CONFIG_NET_IP_DSCP_ECN=n
-CONFIG_NET_STATISTICS=n
-CONFIG_NET_MGMT_EVENT_STACK_SIZE=384
-CONFIG_IEEE802154_RF2XX_RX_STACK_SIZE=384
-
-CONFIG_UART_USE_RUNTIME_CONFIGURE=n" > samples/net/sockets/echo_server/boards/atsamr21_xpro.conf
 west build -p auto -b atsamr21_xpro samples/net/sockets/echo_server -- -DOVERLAY_CONFIG=overlay-802154.conf
+west flash
 '

08-interop/test_spec08.py

@@ -151,7 +151,7 @@ def test_task11(riot_ctrl):
             1,
             'examples/hello-world',
             riotctrl.shell.ShellInteraction,
-            extras={"BINFILE": flashfile},
+            extras={"skip_flash": "1"},
         ),
     )
     zephyr_node.prompt = "uart:~$ "

conftest.py

@@ -383,15 +383,16 @@ def ctrl(
         # need to access private member here isn't possible otherwise sadly :(
         # pylint: disable=W0212
         node._application_directory = os.path.join(riotbase, application_dir)
-        flash_cmd = "flash"
-        if "BINFILE" in node.env:
-            flash_cmd = "flash-only"
-        node.make_run(
-            [flash_cmd],
-            check=True,
-            stdout=None if log_nodes else subprocess.DEVNULL,
-            stderr=None if log_nodes else subprocess.DEVNULL,
-        )
+        if extras and not extras.get("skip_flash", False):
+            flash_cmd = "flash"
+            if "BINFILE" in node.env:
+                flash_cmd = "flash-only"
+            node.make_run(
+                [flash_cmd],
+                check=True,
+                stdout=None if log_nodes else subprocess.DEVNULL,
+                stderr=None if log_nodes else subprocess.DEVNULL,
+            )
         if node.env.get("IOTLAB_NODE"):
             # reset to prevent at86rf2xx `ifconfig` issue
             time.sleep(1)

requirements.txt

@@ -11,3 +11,4 @@ pytest-rerunfailures
 riotctrl
 scapy
 paho-mqtt
+pyserial