From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 7 Sep 2014 17:30:33 +0000 (+0200)
Subject: detect terminal output with 'test -t' in tests
X-Git-Tag: 1.0.8~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/27cb4f6c919921b04f3dddff069620ced250a94f

detect terminal output with 'test -t' in tests

Instead of trying to inspect /proc and the fds inside we use "test -t 1"
instead as this is available and working on kfreebsd as well – not that
something breaks if we wouldn't, but we like color.

Git-Dch: Ignore
---

diff --git a/test/integration/framework b/test/integration/framework
index fde74f55d..ff010a5c4 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -4,7 +4,7 @@ EXIT_CODE=0
 
 # we all like colorful messages
 if [ "$MSGCOLOR" != 'NO' ]; then
-	if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+	if [ ! -t 1 ]; then # but check that we output to a terminal
 		export MSGCOLOR='NO'
 	fi
 fi
diff --git a/test/integration/run-tests b/test/integration/run-tests
index 9dd550aa2..c39a2ac68 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -22,7 +22,7 @@ done
 export MSGLEVEL="${MSGLEVEL:-3}"
 
 if [ "$MSGCOLOR" != 'NO' ]; then
-	if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+	if [ ! -t 1 ]; then # but check that we output to a terminal
 		export MSGCOLOR='NO'
 	fi
 fi