diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
| commit | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (patch) | |
| tree | 732e4b2ff090c01bb07dedeefe25cd517070c256 /test/integration/framework | |
| parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) | |
| parent | d916e2a93b798e29d342e9498266767c5be8e2a5 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/cachefilter.h
configure.ac
debian/changelog
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework index 8f1e7cca5..7cf4d8a6d 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 @@ -1019,7 +1019,13 @@ testfileequal() { testempty() { msgtest "Test for no output of" "$*" - test -z "$($* 2>&1)" && msgpass || msgfail + local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile" + if $* >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then + msgpass + else + cat $COMPAREFILE + msgfail + fi } testequal() { |