diff --git a/dist/testbed-support/Makefile.iotlab b/dist/testbed-support/Makefile.iotlab index a541937541ac8eb96d796c821606a949d6969e75..8e121a6aa52b5b21c563e319a0f9a50384861ca9 100644 --- a/dist/testbed-support/Makefile.iotlab +++ b/dist/testbed-support/Makefile.iotlab @@ -14,18 +14,18 @@ IOTLAB_DEBUG_NODE ?= $(shell experiment-cli get -i $(IOTLAB_EXP_ID) --resource IOTLAB_AUTHORITY = "$(IOTLAB_USER)@$(IOTLAB_SITE).iot-lab.info" ifneq (,$(findstring m3,$(IOTLAB_TYPE))) - BINARY := $(ELFFILE) + BINARY := $(ELFFILE) else - BINARY := $(HEXFILE) + BINARY := $(HEXFILE) endif ifdef IOTLAB_PHY_NODES - NODES_PARAM_BASE = -l$(IOTLAB_SITE),$(firstword $(subst :, ,$(IOTLAB_TYPE))),$(IOTLAB_PHY_NODES) - NODES_PARAM = "$(NODES_PARAM_BASE),$(BINARY),$(IOTLAB_PROFILE)" + NODES_PARAM_BASE = -l$(IOTLAB_SITE),$(firstword $(subst :, ,$(IOTLAB_TYPE))),$(IOTLAB_PHY_NODES) + NODES_PARAM = "$(NODES_PARAM_BASE),$(BINARY),$(IOTLAB_PROFILE)" endif ifdef IOTLAB_EXCLUDE_NODES - EXCLUDE_PARAM := "-e$(IOTLAB_SITE),$(firstword $(subst :, ,$(IOTLAB_TYPE))),$(IOTLAB_EXCLUDE_NODES)" + EXCLUDE_PARAM := "-e$(IOTLAB_SITE),$(firstword $(subst :, ,$(IOTLAB_TYPE))),$(IOTLAB_EXCLUDE_NODES)" endif $(IOTLAB_AUTH): @@ -35,23 +35,23 @@ iotlab-exp: $(IOTLAB_AUTH) all $(eval IOTLAB_SITE ?= grenoble) ifneq (RIOT_EXP,$(IOTLAB_EXP_NAME)) - $(eval IOTLAB_EXP_NAME := RIOT_EXP_$(IOTLAB_EXP_NAME)) + $(eval IOTLAB_EXP_NAME := RIOT_EXP_$(IOTLAB_EXP_NAME)) endif ifndef NODES_PARAM - $(eval NODES_PARAM := "-l$(IOTLAB_NODES),archi=$(IOTLAB_TYPE)+site=$(IOTLAB_SITE),$(BINARY),$(IOTLAB_PROFILE)") + $(eval NODES_PARAM := "-l$(IOTLAB_NODES),archi=$(IOTLAB_TYPE)+site=$(IOTLAB_SITE),$(BINARY),$(IOTLAB_PROFILE)") endif ifeq (,$(Q)) - @echo "experiment-cli submit -d $(IOTLAB_DURATION) $(NODES_PARAM) -n $(IOTLAB_EXP_NAME)" + @echo "experiment-cli submit -d $(IOTLAB_DURATION) $(NODES_PARAM) -n $(IOTLAB_EXP_NAME)" endif $(eval NEW_ID := $(shell experiment-cli submit -d $(IOTLAB_DURATION) $(NODES_PARAM) -n $(IOTLAB_EXP_NAME) | grep -Eo '[[:digit:]]+')) $(Q)experiment-cli wait -i $(NEW_ID) ifdef IOTLAB_LOGGING - $(Q)ssh -t $(IOTLAB_AUTHORITY) "tmux new -d -s riot-$(NEW_ID)\ - 'script -fac "'"'"serial_aggregator -i $(NEW_ID)"'"'"\ - RIOT_LOG-$(IOTLAB_EXP_NAME)-$(NEW_ID)'" + $(Q)ssh -t $(IOTLAB_AUTHORITY) "tmux new -d -s riot-$(NEW_ID)\ + 'script -fac "'"'"serial_aggregator -i $(NEW_ID)"'"'"\ + RIOT_LOG-$(IOTLAB_EXP_NAME)-$(NEW_ID)'" endif iotlab-flash: $(IOTLAB_AUTH) iotlab-check-exp all @@ -83,5 +83,5 @@ iotlab-term: iotlab-check-exp iotlab-check-exp: ifndef IOTLAB_SITE - $(eval IOTLAB_SITE := $(shell experiment-cli get -ri -i $(IOTLAB_EXP_ID) | sed -n 4p | cut -d\" -f2)) + $(eval IOTLAB_SITE := $(shell experiment-cli get -ri -i $(IOTLAB_EXP_ID) | sed -n 4p | cut -d\" -f2)) endif