From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 24 Jul 2012 22:30:22 +0000 (+0200)
Subject: [ng] tests: fix spurious failure in 'color-tests2.sh'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40d140a6569ff4ec9b8619cb9d1cbefbc13e59b8;p=thirdparty%2Fautomake.git

[ng] tests: fix spurious failure in 'color-tests2.sh'

* t/color-tests2.sh: Change the idioms used to specify the value of
'AM_COLOR_TESTS' to make.  This is required since, in contrast with
what happens in the mainline Automake counterpart, this script doesn't
invoke make with the '-e' option.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/t/color-tests2.sh b/t/color-tests2.sh
index f8bd85b3a..c66dbe5f6 100755
--- a/t/color-tests2.sh
+++ b/t/color-tests2.sh
@@ -130,7 +130,7 @@ for vpath in false :; do
   cat stdout
   test_no_color
 
-  AM_COLOR_TESTS=no MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+  MAKE="$MAKE AM_COLOR_TESTS=no" expect -f $srcdir/expect-make >stdout \
     || { cat stdout; exit 1; }
   cat stdout
   test_no_color
@@ -142,7 +142,7 @@ for vpath in false :; do
   cat stdout
   test_no_color
 
-  TERM=ansi MAKE="env AM_COLOR_TESTS=always $MAKE" \
+  TERM=ansi MAKE="$MAKE AM_COLOR_TESTS=always" \
     expect -f $srcdir/expect-make >stdout || { cat stdout; exit 1; }
   cat stdout
   test_color