Skip to content
Snippets Groups Projects
Commit afd9aa0b authored by Cenk Gündoğan's avatar Cenk Gündoğan
Browse files

dist: make: iotlab: specify exp id in iotlab-term

parent 5817d91b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dist/testbed-support/Makefile.iotlab
+ 6
− 15
View file @ afd9aa0b
...@@ -71,21 +71,12 @@ iotlab-stop: $(IOTLAB_AUTH) iotlab-check-exp ...@@ -71,21 +71,12 @@ iotlab-stop: $(IOTLAB_AUTH) iotlab-check-exp
iotlab-term: iotlab-check-exp iotlab-term: iotlab-check-exp
$(AD)ssh -t $(IOTLAB_AUTHORITY) "test -f ~/.iotlabrc || auth-cli -u $(IOTLAB_USER)" $(AD)ssh -t $(IOTLAB_AUTHORITY) "test -f ~/.iotlabrc || auth-cli -u $(IOTLAB_USER)"
ifndef NODES_PARAM $(AD)ssh -t $(IOTLAB_AUTHORITY) \
$(AD)ssh -t $(IOTLAB_AUTHORITY)\ "tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID) \
"tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID)\ '$(if $(IOTLAB_LOGGING), \
'$(if $(IOTLAB_LOGGING),\ script -fac "'"'"serial_aggregator -i $(IOTLAB_EXP_ID) $(NODES_PARAM_BASE)"'"'" \
script -fac "'"'"serial_aggregator -i $(IOTLAB_EXP_ID)"'"'"\ RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID), \
RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID),\ serial_aggregator -i $(IOTLAB_EXP_ID) $(NODES_PARAM_BASE))'"
serial_aggregator -i $(IOTLAB_EXP_ID))'"
else
$(AD)ssh -t $(IOTLAB_AUTHORITY)\
"tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID)\
'$(if $(IOTLAB_LOGGING),\
script -fac "'"'"serial_aggregator $(NODES_PARAM_BASE)"'"'"\
RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID),\
serial_aggregator $(NODES_PARAM_BASE))'"
endif
iotlab-check-exp: iotlab-check-exp:
ifndef IOTLAB_SITE ifndef IOTLAB_SITE
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment