]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
[ng] tests: fix spurious failure in 'color-tests2.sh'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 24 Jul 2012 22:30:22 +0000 (00:30 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 24 Jul 2012 22:39:55 +0000 (00:39 +0200)
* 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>
t/color-tests2.sh

index f8bd85b3a941f11d739773b9b7d140f4ec3e080f..c66dbe5f6577f00195d0cdeebc47846c87f07b47 100755 (executable)
@@ -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