[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2128-g7f2bc63

[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=7f2bc63991aeed6ddec5f28dc2162a281ff8ee3d

The branch, master has been updated
       via  7f2bc63991aeed6ddec5f28dc2162a281ff8ee3d (commit)
       via  ab1a507e362fabc1b33a4cec1522738948acf800 (commit)
      from  2bf9b58d1153cb51be592f009192a48798b5e97e (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 7f2bc63991aeed6ddec5f28dc2162a281ff8ee3d
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 9 00:17:48 2012 +0200

    tests: avoid spurious failures with non-flex 'lex' programs and C++
    
    This change fixes automake bug#11185.
    
    The commit v1.11-2058-g6f4b08d of 06-03-2012, "tests: explicitly
    state that our lexers do not require unistd.h" has broken the tests
    'lex-clean-cxx.test' and 'lex-depend-cxx.test' on Solaris, where lex
    is not flex and does not understand the "%option never-interactive"
    directive.  Remove the use of this directive, resorting to defining
    a dummy 'isatty()' function instead to keep the flex-generated tests
    able to compile also on MinGW/MSYS.
    
    * tests/lex-clean-cxx.test (parsefoo.lxx): Define a dummy 'isatty()'
    function.
    * tests/lex-depend-cxx.test (joe.ll): Likewise.
    * tests/README: Adjust.  Fix an unrelated typo since we are at it.
    
    Co-authored-by: Peter Rosin <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ab1a507e362fabc1b33a4cec1522738948acf800
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 8 23:55:48 2012 +0200

    tests: avoid a spurious failures for shells with busted 'set -e'
    
    Some versions of the BSD Korn shell wrongly bail out when the
    'errexit' shell flag is active and the left-hand command in a
    "&&" list fails and that list is the *last* command of the body
    of a "while" or "for" loop.
    
    * tests/install-info-dir.test: Work around that behaviour.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 tests/README                |    4 ++--
 tests/install-info-dir.test |    1 +
 tests/lex-clean-cxx.test    |    2 +-
 tests/lex-depend-cxx.test   |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/README b/tests/README
index 33a653c..b7009ca 100644
--- a/tests/README
+++ b/tests/README
@@ -268,9 +268,9 @@ Do
     %{
     #define YY_NO_UNISTD_H 1
     %}
-  to accomodate non-ANSI systems, since GNU flex generates code that
+  to accommodate non-ANSI systems, since GNU flex generates code that
   includes unistd.h otherwise.  Also add:
-    %option never-interactive
+    static int isatty (int fd) { return 0; }
   to the definitions section if the generated code is to be compiled
   by a C++ compiler, for similar reasons (i.e., the isatty(3) function
   from that same unistd.h header would be required otherwise).
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index c76f424..9e40f54 100755
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -170,6 +170,7 @@ if test $have_installinfo = yes; then
     env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
     test ! -f $instdir/info/foo.info
     $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+    : For shells with busted 'set -e'.
   done
 fi
 
diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test
index 9ff2dbc..4089f0e 100755
--- a/tests/lex-clean-cxx.test
+++ b/tests/lex-clean-cxx.test
@@ -55,8 +55,8 @@ END
 cat > parsefoo.lxx << 'END'
 %{
 #define YY_NO_UNISTD_H 1
+static int isatty (int fd) { return 0; }
 %}
-%option never-interactive
 %%
 "GOOD"   return EOF;
 .
diff --git a/tests/lex-depend-cxx.test b/tests/lex-depend-cxx.test
index 5249102..8e7a239 100755
--- a/tests/lex-depend-cxx.test
+++ b/tests/lex-depend-cxx.test
@@ -48,8 +48,8 @@ END
 cat > joe.ll << 'END'
 %{
 #define YY_NO_UNISTD_H 1
+static int isatty (int fd) { return 0; }
 %}
-%option never-interactive
 %%
 "foo" return EOF;
 .


hooks/post-receive
-- 
GNU Automake