From 124f9ec9bb90b16aaffc547fd580127c33250b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Wed, 9 May 2018 17:28:45 +0200
Subject: [PATCH] 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.
---
dist/testbed-support/makefile.iotlab.single.inc.mk | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/dist/testbed-support/makefile.iotlab.single.inc.mk b/dist/testbed-support/makefile.iotlab.single.inc.mk
index 895fb223ae..ad742239fa 100644
--- a/dist/testbed-support/makefile.iotlab.single.inc.mk
+++ b/dist/testbed-support/makefile.iotlab.single.inc.mk
@@ -135,13 +135,18 @@ endif
# 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))
# M3 and wsn430 nodes
FLASHER = iotlab-node
RESET = iotlab-node
- FFLAGS = $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --update $(IOTLAB_FLASHFILE)
- RESET_FLAGS = $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --reset
+ _NODE_FMT = --jmespath='keys(@)[0]' --format='int'
+ 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))
TERMPROG = ssh
@@ -156,8 +161,9 @@ else
# A8-M3 node
FLASHER = iotlab-ssh
RESET = iotlab-ssh
- FFLAGS = $(_IOTLAB_EXP_ID) flash-m3 $(_IOTLAB_NODELIST) $(IOTLAB_FLASHFILE)
- RESET_FLAGS = $(_IOTLAB_EXP_ID) reset-m3 $(_IOTLAB_NODELIST)
+ _NODE_FMT = --jmespath='keys(values(@)[0])[0]' --fmt='int'
+ 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
ifeq (,$(_IOTLAB_ON_FRONTEND))
--
GitLab