RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

dist/testbed-support: Make tmux optional with iotlab-term

Browse Source
This commit is contained in:
Martine S. Lenders 2020-01-21 14:59:21 +01:00
parent 59ecc48eb6
commit d455662a02
No known key found for this signature in database
GPG Key ID: CCD317364F63286F
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,8 @@ iotlab-exp: $(IOTLAB_AUTH) all
$(Q)iotlab-experiment wait -i $(NEW_ID) $(Q)iotlab-experiment 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) \
"$(if $(IOTLAB_TMUX),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
@ -85,8 +86,8 @@ iotlab-term: $(IOTLABTERMFLASHDEPS)
iotlab-auth -u $(IOTLAB_USER)" iotlab-auth -u $(IOTLAB_USER)"
$(Q)ssh -t $(IOTLAB_AUTHORITY) \ $(Q)ssh -t $(IOTLAB_AUTHORITY) \
"tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID) \ "$(if $(IOTLAB_TMUX),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) $(NODES_PARAM_BASE)"'"'" \
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) $(NODES_PARAM_BASE))$(if $(IOTLAB_TMUX),',)"

6
dist/testbed-support/README.iotlab.md vendored
View File

@ -36,6 +36,7 @@ brackets):
* IOTLAB_PROFILE * IOTLAB_PROFILE
* IOTLAB_EXCLUDE_NODES * IOTLAB_EXCLUDE_NODES
* IOTLAB_LOGGING * IOTLAB_LOGGING
* IOTLAB_TMUX
### Format of a Resource ID ### Format of a Resource ID
Both variables `IOTLAB_PHY_NODES` and `IOTLAB_EXCLUDE_NODES` use the resource id Both variables `IOTLAB_PHY_NODES` and `IOTLAB_EXCLUDE_NODES` use the resource id
@ -86,5 +87,6 @@ using the resource id string format as described above.
Uses ssh to login the user on the IoT-LAB server of the specified site and Uses ssh to login the user on the IoT-LAB server of the specified site and
start the `serial_aggregator` to communication with all registered nodes. start the `serial_aggregator` to communication with all registered nodes.
If `IOTLAB_LOGGING` is set to `1`, then closing the connection with `CTRL+C/D` will also quit If `IOTLAB_LOGGING` is set to `1`, then closing the connection with `CTRL+C/D` will also quit
the logging process. Detach from the server-side tmux process with `CTRL+A-D` the logging process. If you enabled TMUX with `IOTLAB_TMUX`, detach from the
(or as defined in your server-side `.tmux.conf` file) server-side tmux process with `CTRL+A-D` (or as defined in your server-side
`.tmux.conf` file)