[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1581-g1ca9efa

[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=1ca9efa3c2550e2ccc62056cd1add08e9583deae

The branch, testsuite-work has been updated
       via  1ca9efa3c2550e2ccc62056cd1add08e9583deae (commit)
       via  18bdec7225f41cda755881f660ea4bea814538fa (commit)
      from  8d3466c80bf79be7770e41fabfb886b0eadd2acb (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 1ca9efa3c2550e2ccc62056cd1add08e9583deae
Author: Stefano Lattarini <address@hidden>
Date:   Thu Dec 15 23:52:46 2011 +0100

    tests: fix spurious failure in 'color2.test'
    
    * tests/color2.test: (expect-make): Add an "expect eof" directive,
    so that the collected output from the spawned make program will be
    displayed on stdout, as desired.
    Since we are at it, also correctly remove a temporary file which
    we was trying to delete using a wrong filename.
    
    Problem introduced in merge `v1.11-1579-g8d3466c', probably by a
    botched edit or conflict resolution.

commit 18bdec7225f41cda755881f660ea4bea814538fa
Author: Stefano Lattarini <address@hidden>
Date:   Thu Dec 15 23:12:07 2011 +0100

    tests: fix spurious failure in 'lex3.test'
    
    * tests/lex3.test (foo.l): Remove duplicated definition of
    `yywrap'.  Problem introduced in merge `v1.11-1579-g8d3466c'.

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

Summary of changes:
 ChangeLog         |   17 +++++++++++++++++
 tests/color2.test |    3 ++-
 tests/lex3.test   |    6 ------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c17eb4..2de1e05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-12-15  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'color2.test'
+       * tests/color2.test: (expect-make): Add an "expect eof" directive,
+       so that the collected output from the spawned make program will be
+       displayed on stdout, as desired.
+       Since we are at it, also correctly remove a temporary file which
+       we was trying to delete using a wrong filename.
+       Problem introduced in merge `v1.11-1579-g8d3466c', probably by a
+       botched edit or conflict resolution.
+
+2011-12-15  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'lex3.test'
+       * tests/lex3.test (foo.l): Remove duplicated definition of
+       `yywrap'.  Problem introduced in merge `v1.11-1579-g8d3466c'.
+
 2011-12-09  Jim Meyering  <address@hidden>
            Stefano Lattarini  <address@hidden>
 
diff --git a/tests/color2.test b/tests/color2.test
index 50e6c47..ab5ab82 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -65,7 +65,7 @@ exit 1
 END
 MAKE=$MAKE expect -f expect-check \
   || skip_ "make spawned by expect should have a tty stdout"
-rm -f check Makefile
+rm -f expect-check Makefile
 
 # Do the tests.
 
@@ -161,6 +161,7 @@ test_no_color ()
 
 cat >expect-make <<'END'
 eval spawn $env(MAKE) -e check
+expect eof
 END
 
 for vpath in false :; do
diff --git a/tests/lex3.test b/tests/lex3.test
index e8f0200..46f0b9f 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -54,12 +54,6 @@ int yywrap (void)
 {
   return 1;
 }
-
-/* Avoid possible link errors. */
-int yywrap (void)
-{
-  return 1;
-}
 END
 
 $ACLOCAL


hooks/post-receive
-- 
GNU Automake