From: Christian Brauner <christian.brauner@mailbox.org>
Date: Wed, 13 Apr 2016 13:41:58 +0000 (+0200)
Subject: only execute last test when we are a pty
X-Git-Tag: lxc-2.1.0~448^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F970%2Fhead;p=thirdparty%2Flxc.git

only execute last test when we are a pty

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
---

diff --git a/src/tests/lxc-test-lxc-attach b/src/tests/lxc-test-lxc-attach
index 27062e3e9..380a6db30 100755
--- a/src/tests/lxc-test-lxc-attach
+++ b/src/tests/lxc-test-lxc-attach
@@ -190,14 +190,16 @@ fi
 
 rm -f $out $err
 
-# Test whether logging pty output to a file works.
-trap "rm -f /tmp/ptylog" EXIT INT QUIT PIPE
-lxc-attach -n busy -L /tmp/ptylog -- hostname || FAIL "to allocate or setup pty"
-if [ $allocate_pty == "pty" ] && [ ! -s /tmp/ptylog ]; then
-        FAIL "lxc-attach -n busy -L /tmp/ptylog -- hostname"
-fi
+if [ $allocate_pty = "pty" ]; then
+	# Test whether logging pty output to a file works.
+	trap "rm -f /tmp/ptylog" EXIT INT QUIT PIPE
+	lxc-attach -n busy -L /tmp/ptylog -- hostname || FAIL "to allocate or setup pty"
+	if [ ! -s /tmp/ptylog ]; then
+		FAIL "lxc-attach -n busy -L /tmp/ptylog -- hostname"
+	fi
 
-rm -f /tmp/ptylog
+	rm -f /tmp/ptylog
+fi
 
 lxc-destroy -n busy -f