diff options
| author | Gregor Beck <gbeck@sernet.de> | 2013-12-12 11:38:22 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-02-11 16:02:14 +0100 |
| commit | ffd0585dd2db0af298fdbe1c7d5aba3cd3699bbc (patch) | |
| tree | 7f1a23020e4b74e5ae5eac27ba41dc6faf9c9620 | |
| parent | 34e6d793520b465d4b94d837b2e902651b1a65be (diff) | |
| download | samba-ffd0585dd2db0af298fdbe1c7d5aba3cd3699bbc.tar.gz samba-ffd0585dd2db0af298fdbe1c7d5aba3cd3699bbc.tar.xz samba-ffd0585dd2db0af298fdbe1c7d5aba3cd3699bbc.zip | |
selftest: let "make testenv SCREEN=1" use tmux if it is running
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
| -rwxr-xr-x | selftest/in_screen | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/selftest/in_screen b/selftest/in_screen index 8bfbc0101b0..5468a216e31 100755 --- a/selftest/in_screen +++ b/selftest/in_screen @@ -69,7 +69,11 @@ cleanup() { rm -f $basedir/$SERVERNAME.status $basedir/$SERVERNAME.log echo $$ > $basedir/$SERVERNAME.parent.pid trap cleanup SIGINT SIGTERM SIGPIPE -screen -r -X screen -t test:$SERVERNAME bash $basedir/$SERVERNAME.launch +if [[ "$TMUX" ]]; then + tmux new-window -n test:$SERVERNAME "bash $basedir/$SERVERNAME.launch" +else + screen -r -X screen -t test:$SERVERNAME bash $basedir/$SERVERNAME.launch +fi echo "$(date) waiting in $$" >> $basedir/$SERVERNAME.log read stdin_var echo "$(date) EOF on stdin" >> $basedir/$SERVERNAME.log |