[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-300-g4a49256

[Stefano Lattarini]

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=4a492566abfbecd896073dc62e4099e182e5e69c

The branch, maint has been updated
       via  4a492566abfbecd896073dc62e4099e182e5e69c (commit)
       via  c876b0e062a41150a667470e250794efed83f721 (commit)
      from  7e2e93d82b46e743c68a821684fc5afc54bfef54 (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 4a492566abfbecd896073dc62e4099e182e5e69c
Merge: 7e2e93d c876b0e
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jan 22 14:50:20 2011 +0100

    Merge branch 'yflags-test-fixes' into maint

commit c876b0e062a41150a667470e250794efed83f721
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jan 22 13:32:14 2011 +0100

    tests: fix spurious failures in yflags*.test
    
    * tests/yflags.test: Remove 'YACC' from the environment, so
    that it won't be erroneously picked up by `make -e'.
    * tests/yflags2.test: Likewise.

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

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/yflags.test  |    6 +++++-
 tests/yflags2.test |    6 +++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04b30dd..7c42b84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-22  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in yflags*.test
+       * tests/yflags.test: Remove 'YACC' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/yflags2.test: Likewise.
+
 2011-01-22  Ralf Wildenhues  <address@hidden>
 
        tests: avoid fn99*.test failures due to buggy AIX 5.3 cp -R.
diff --git a/tests/yflags.test b/tests/yflags.test
index fcb0c64..dbc3a73 100755
--- a/tests/yflags.test
+++ b/tests/yflags.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,6 +30,10 @@ echo 'extern int dummy;' >> y.tab.c
 END
 chmod a+x fake-yacc
 
+# Remove Yacc from the environment, so that it won't interfere
+# with `make -e' below.
+unset YACC || :
+
 cat >> configure.in <<'END'
 AC_PROG_CC
 # Simulate presence of Yacc using our fake-yacc script.
diff --git a/tests/yflags2.test b/tests/yflags2.test
index 346c2e4..02aed8d 100755
--- a/tests/yflags2.test
+++ b/tests/yflags2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,6 +31,10 @@ echo 'extern int dummy;' >> y.tab.c
 END
 chmod a+x fake-yacc
 
+# Remove Yacc from the environment, so that it won't interfere
+# with `make -e' below.
+unset YACC || :
+
 cat >> configure.in <<'END'
 AC_PROG_CXX
 # Simulate presence of Yacc using our fake-yacc script.


hooks/post-receive
-- 
GNU Automake