From: Gregor Beck <gbeck@sernet.de>
Date: Thu, 12 Dec 2013 10:38:22 +0000 (+0100)
Subject: selftest: let "make testenv SCREEN=1" use tmux if it is running
X-Git-Tag: tdb-1.2.13~550
X-Git-Url: http://git.samba.org/samba.git/?p=metze%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=ffd0585dd2db0af298fdbe1c7d5aba3cd3699bbc

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>
---

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