[SCM] GNU Automake branch, master, updated. Release-1-10-66-g83df77e

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=83df77e58dbce5bb38f0b70ecd3cab7fdfda4d00

The branch, master has been updated
       via  83df77e58dbce5bb38f0b70ecd3cab7fdfda4d00 (commit)
       via  4813ffea652a8960b9fa073f4e302fc4c916bed9 (commit)
      from  4b4f1e31e44e8d94a7d8fc3357433e35a02445e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 83df77e58dbce5bb38f0b70ecd3cab7fdfda4d00
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Nov 12 19:53:32 2007 +0100

    Avoid spurious test failure with `make check TESTS=check5.test'.
    
    * tests/check5.test: unset TESTS.

commit 4813ffea652a8960b9fa073f4e302fc4c916bed9
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Nov 12 19:51:06 2007 +0100

    Fix maintainer-check failure.
    
    * tests/color.test: unset TESTS, use `make -e' rather than
    `make MACRO=val'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    9 +++++++++
 tests/check5.test |    3 ++-
 tests/color.test  |   10 ++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 828202b..f02f870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-12  Ralf Wildenhues  <address@hidden>
+
+       Avoid spurious test failure with `make check TESTS=check5.test'.
+       * tests/check5.test: unset TESTS.
+
+       Fix maintainer-check failure.
+       * tests/color.test: unset TESTS, use `make -e' rather than
+       `make MACRO=val'.
+
 2007-11-10  Ralf Wildenhues  <address@hidden>
 
        * configure.ac (AM_INIT_AUTOMAKE): Require version 1.10a.
diff --git a/tests/check5.test b/tests/check5.test
index 7e0e01b..18a6e15 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -50,6 +50,7 @@ END
 cp one.c two.c
 
 ./configure
+unset TESTS
 $MAKE check
 test -f ok
 EXEEXT=.bin $MAKE -e print-tests >output
diff --git a/tests/color.test b/tests/color.test
index b7ba486..d30d1e0 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -86,19 +86,21 @@ test_no_color ()
 
 cat >expect-make <<'END'
 #! /usr/bin/expect -f
-spawn $env(MAKE) check $argv
+spawn $env(MAKE) -e check
 expect eof
 END
 
-$MAKE check AM_COLOR_TESTS=always >stdout && { cat stdout; exit 1; }
+unset TESTS
+
+AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; exit 1; }
 cat stdout
 test_color
 
-MAKE=$MAKE expect -f expect-make foo= >stdout || exit 77
+MAKE=$MAKE expect -f expect-make >stdout || exit 77
 cat stdout
 test_color
 
-MAKE=$MAKE expect -f expect-make AM_COLOR_TESTS=no >stdout || exit 77
+AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout || exit 77
 cat stdout
 test_no_color
 :


hooks/post-receive
--
GNU Automake