RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

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

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

This makes command fail when they failed on IoT-LAB.
This commit is contained in:
Gaëtan Harter 2018-05-09 17:28:45 +02:00
parent d900e0a548
commit 124f9ec9bb
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/testbed-support/makefile.iotlab.single.inc.mk vendored
View File

@ -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
# 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))