[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-308-g9095d6b

[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=9095d6b98f6d9d3755e8b592f336011aef11d61f

The branch, maint has been updated
       via  9095d6b98f6d9d3755e8b592f336011aef11d61f (commit)
       via  57198decf1d0dfa758d70ac564e2aec4281798d0 (commit)
      from  06b46e1f8f307d2f6d0af6a9d73f7003171d0745 (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 9095d6b98f6d9d3755e8b592f336011aef11d61f
Merge: 06b46e1 57198de
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jan 29 18:47:39 2011 +0100

    Merge branch 'lflags-test-fixes' into maint

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

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/lflags.test  |    4 ++++
 tests/lflags2.test |    4 ++++
 3 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bed0418..dd96e23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-29  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in lflags*.test
+       * tests/lflags.test: Remove 'LEX' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/lflags2.test: Likewise.
+
 2011-01-24  Stefano Lattarini  <address@hidden>
 
        docs: color-tests issues with parallel make
diff --git a/tests/lflags.test b/tests/lflags.test
index 97de608..4c3e048 100755
--- a/tests/lflags.test
+++ b/tests/lflags.test
@@ -30,6 +30,10 @@ echo 'extern int dummy;' >> lex.yy.c
 END
 chmod a+x fake-lex
 
+# Remove Lex from the environment, so that it won't interfere
+# with `make -e' below.
+unset LEX || :
+
 cat >> configure.in <<'END'
 AC_PROG_CC
 # Simulate presence of Lex using our fake-lex script.
diff --git a/tests/lflags2.test b/tests/lflags2.test
index df766b2..f13c656 100755
--- a/tests/lflags2.test
+++ b/tests/lflags2.test
@@ -31,6 +31,10 @@ echo 'extern int dummy;' >> lex.yy.c
 END
 chmod a+x fake-lex
 
+# Remove Lex from the environment, so that it won't interfere
+# with `make -e' below.
+unset LEX || :
+
 cat >> configure.in <<'END'
 AC_PROG_CXX
 # Simulate presence of Lex using our fake-lex script.


hooks/post-receive
-- 
GNU Automake