Skip to content
Snippets Groups Projects
Unverified Commit 124f9ec9 authored by Gaëtan Harter's avatar Gaëtan Harter
Browse files

makefile.iotlab.single: check iotlab-node/iotlab-ssh return value

Format the output to be '0' on success and check it with grep.

This makes command fail when they failed on IoT-LAB.
parent d900e0a5
No related branches found
No related tags found
No related merge requests found
...@@ -135,13 +135,18 @@ endif ...@@ -135,13 +135,18 @@ endif
# Configure FLASHER, RESET, TERMPROG depending on BOARD and if on frontend # Configure FLASHER, RESET, TERMPROG depending on BOARD and if on frontend
# Command to check if 'stdin' is 0. Cannot use 'cmp - <(echo 0)' without bash shell
_STDIN_EQ_0 = grep 0
ifneq (iotlab-a8-m3,$(BOARD)) ifneq (iotlab-a8-m3,$(BOARD))
# M3 and wsn430 nodes # M3 and wsn430 nodes
FLASHER = iotlab-node FLASHER = iotlab-node
RESET = iotlab-node RESET = iotlab-node
FFLAGS = $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --update $(IOTLAB_FLASHFILE) _NODE_FMT = --jmespath='keys(@)[0]' --format='int'
RESET_FLAGS = $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --reset FFLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --update $(IOTLAB_FLASHFILE) | $(_STDIN_EQ_0)
RESET_FLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --reset | $(_STDIN_EQ_0)
ifeq (,$(_IOTLAB_ON_FRONTEND)) ifeq (,$(_IOTLAB_ON_FRONTEND))
TERMPROG = ssh TERMPROG = ssh
...@@ -156,8 +161,9 @@ else ...@@ -156,8 +161,9 @@ else
# A8-M3 node # A8-M3 node
FLASHER = iotlab-ssh FLASHER = iotlab-ssh
RESET = iotlab-ssh RESET = iotlab-ssh
FFLAGS = $(_IOTLAB_EXP_ID) flash-m3 $(_IOTLAB_NODELIST) $(IOTLAB_FLASHFILE) _NODE_FMT = --jmespath='keys(values(@)[0])[0]' --fmt='int'
RESET_FLAGS = $(_IOTLAB_EXP_ID) reset-m3 $(_IOTLAB_NODELIST) FFLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) flash-m3 $(_IOTLAB_NODELIST) $(IOTLAB_FLASHFILE) | $(_STDIN_EQ_0)
RESET_FLAGS = $(_NODE_FMT) $(_IOTLAB_EXP_ID) reset-m3 $(_IOTLAB_NODELIST) | $(_STDIN_EQ_0)
TERMPROG = ssh TERMPROG = ssh
ifeq (,$(_IOTLAB_ON_FRONTEND)) ifeq (,$(_IOTLAB_ON_FRONTEND))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment