RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 22:32:44 +01:00
Code Releases Activity

dist/testbed-support: fix iotlab makefile indentation

Browse Source
This commit is contained in:
Alexandre Abadie 2017-11-16 10:55:39 +01:00
parent 8bf59b80c2
commit ba62eb5f51
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dist/testbed-support/Makefile.iotlab vendored
View File

@ -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" IOTLAB_AUTHORITY = "$(IOTLAB_USER)@$(IOTLAB_SITE).iot-lab.info"
ifneq (,$(findstring m3,$(IOTLAB_TYPE))) ifneq (,$(findstring m3,$(IOTLAB_TYPE)))
BINARY := $(ELFFILE) BINARY := $(ELFFILE)
else else
BINARY := $(HEXFILE) BINARY := $(HEXFILE)
endif endif
ifdef IOTLAB_PHY_NODES ifdef IOTLAB_PHY_NODES
NODES_PARAM_BASE = -l$(IOTLAB_SITE),$(firstword $(subst :, ,$(IOTLAB_TYPE))),$(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 = "$(NODES_PARAM_BASE),$(BINARY),$(IOTLAB_PROFILE)"
endif endif
ifdef IOTLAB_EXCLUDE_NODES 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 endif
$(IOTLAB_AUTH): $(IOTLAB_AUTH):
@ -35,23 +35,23 @@ iotlab-exp: $(IOTLAB_AUTH) all
$(eval IOTLAB_SITE ?= grenoble) $(eval IOTLAB_SITE ?= grenoble)
ifneq (RIOT_EXP,$(IOTLAB_EXP_NAME)) 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 endif
ifndef NODES_PARAM 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 endif
ifeq (,$(Q)) 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 endif
$(eval NEW_ID := $(shell experiment-cli submit -d $(IOTLAB_DURATION) $(NODES_PARAM) -n $(IOTLAB_EXP_NAME) | grep -Eo '[[:digit:]]+')) $(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) $(Q)experiment-cli wait -i $(NEW_ID)
ifdef IOTLAB_LOGGING ifdef IOTLAB_LOGGING
$(Q)ssh -t $(IOTLAB_AUTHORITY) "tmux new -d -s riot-$(NEW_ID)\ $(Q)ssh -t $(IOTLAB_AUTHORITY) "tmux new -d -s riot-$(NEW_ID)\
'script -fac "'"'"serial_aggregator -i $(NEW_ID)"'"'"\ 'script -fac "'"'"serial_aggregator -i $(NEW_ID)"'"'"\
RIOT_LOG-$(IOTLAB_EXP_NAME)-$(NEW_ID)'" RIOT_LOG-$(IOTLAB_EXP_NAME)-$(NEW_ID)'"
endif endif
iotlab-flash: $(IOTLAB_AUTH) iotlab-check-exp all iotlab-flash: $(IOTLAB_AUTH) iotlab-check-exp all
@ -83,5 +83,5 @@ iotlab-term: iotlab-check-exp
iotlab-check-exp: iotlab-check-exp:
ifndef IOTLAB_SITE 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 endif