From afd9aa0bd86b99b4f414a8415952cac52b64fc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Tue, 19 Apr 2016 09:53:46 +0200 Subject: [PATCH] dist: make: iotlab: specify exp id in iotlab-term --- dist/testbed-support/Makefile.iotlab | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dist/testbed-support/Makefile.iotlab b/dist/testbed-support/Makefile.iotlab index fd6b5149f..471d94d2c 100644 --- a/dist/testbed-support/Makefile.iotlab +++ b/dist/testbed-support/Makefile.iotlab @@ -71,21 +71,12 @@ iotlab-stop: $(IOTLAB_AUTH) iotlab-check-exp iotlab-term: iotlab-check-exp $(AD)ssh -t $(IOTLAB_AUTHORITY) "test -f ~/.iotlabrc || auth-cli -u $(IOTLAB_USER)" - ifndef NODES_PARAM - $(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 -i $(IOTLAB_EXP_ID)"'"'"\ - RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID),\ - 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 + $(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 -i $(IOTLAB_EXP_ID) $(NODES_PARAM_BASE)"'"'" \ + RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID), \ + serial_aggregator -i $(IOTLAB_EXP_ID) $(NODES_PARAM_BASE))'" iotlab-check-exp: ifndef IOTLAB_SITE