[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-78-g0592e12

[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=0592e126d5f8e2de04894944c4cad9fe35198d30

The branch, maint has been updated
       via  0592e126d5f8e2de04894944c4cad9fe35198d30 (commit)
       via  f9006f81c15d6e7901e9c4d5fd78ab284f66355a (commit)
       via  911204a1e0689426409439b997a1acbcb5b63801 (commit)
      from  d89da9c295ac67ce985270da16f45c4abd1a089a (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 0592e126d5f8e2de04894944c4cad9fe35198d30
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 16 16:26:39 2012 +0200

    yacc tests: avoid a spurious failure with Sun C++ 5.9
    
    * t/yacc-cxx.sh (parse1.yy): When calling the 'getchar' function declared
    in the #included <cstdio>, fully qualify it as std::getchar', to avoid
    Sun C++ 5.9 erroring out with:
    "parse1.yy", line 5: Error: The function "getc" must have a prototype.
    * t/yacc-clean-cxx.sh (sub1/parsefoo.yxx): Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f9006f81c15d6e7901e9c4d5fd78ab284f66355a
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 16 16:10:06 2012 +0200

    self tests: cater for /bin/ksh symlinked to Zsh
    
    * t/self-check-reexec.tap: When searching for a suitable non-Bash
    shells, be sure to reject any shell that is Zsh "in disguise" (as
    can be found on some Debian systems, where /bin/ksh can be symlinked
    to /bin/zsh4).  This is required because our testsuite does not
    support older versions of Zsh, and that was causing the test to fail
    in the setup just described.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 911204a1e0689426409439b997a1acbcb5b63801
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 16 15:50:14 2012 +0200

    tests: fix spurious failures due to dpkg install-info
    
    * t/install-info-dir.sh: Skip some checks if 'install-info' is the one
    from dpkg, not the one from GNU info; the former might try to create
    files in '/var/backups/', causing spurious failures like this for any
    non-root user:
    
        install-info(.../install-info-dir.dir/_inst/info/foo.info): \
          creating new section `Dummy utilities'
        cp: cannot create regular file `/var/backups/infodir.bak': \
          Permission denied
        install-info(.../install-info-dir.dir/_inst/info/foo.info): \
          could not backup .../install-info-dir.dir/_inst/info/dir in \
          /var/backups/infodir.bak: No such file or directory
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 t/install-info-dir.sh   |   10 +++++++++-
 t/self-check-reexec.tap |    7 ++++++-
 t/yacc-clean-cxx.sh     |    3 ++-
 t/yacc-cxx.sh           |    3 ++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index d8b32d8..12b2293 100755
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
@@ -67,7 +67,15 @@ $MAKE info
 test -f foo.info
 
 if install-info --version; then
-  have_installinfo=yes
+  # Skip some checks even if 'install-info' is the one from dpkg, not
+  # the one from GNU info, as the former might try to create files in
+  # '/var/backups/', causing spurious failures like this for non-root
+  # users.
+  if install-info --version | $EGREP -i '(dpkg|debian) install-info'; then
+    have_installinfo=no
+  else
+    have_installinfo=yes
+  fi
 else
   have_installinfo=no
 fi
diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap
index 7b91008..e19a681 100755
--- a/t/self-check-reexec.tap
+++ b/t/self-check-reexec.tap
@@ -48,7 +48,12 @@ for non_bash_shell in \
 do
   test "$non_bash_shell" = : && break
   $non_bash_shell -c 'exit 0' || continue
-  $non_bash_shell -c 'test -n "$BASH_VERSION"' && continue
+  # Be sure to reject also any shell that is Zsh "in disguise" (as can
+  # be found on some Debian systems, where /bin/ksh can be symlinked to
+  # /bin/zsh4).  This is required because our testsuite does not support
+  # older versions of Zsh, and that has caused spurious failures in the
+  # past.
+  $non_bash_shell -c 'test -n "$ZSH_VERSION$BASH_VERSION"' && continue
   break
 done
 
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index d8ee1c6..399f026 100755
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
@@ -68,7 +68,8 @@ cat > sub1/parsefoo.yxx << 'END'
 %{
 // This file should contain valid C++ but invalid C.
 #include <cstdio>
-int yylex (void) { return (getchar ()); }
+// "std::" qualification required by Sun C++ 5.9.
+int yylex (void) { return std::getchar (); }
 void yyerror (const char *s) { return; }
 %}
 %%
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index dfcc12a..41a25ec 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -46,7 +46,8 @@ cat > parse1.yy << 'END'
 // Valid C++, but deliberately invalid C.
 #include <cstdio>
 #include <cstdlib>
-int yylex (void) { return getchar (); }
+// "std::" qualification required by Sun C++ 5.9.
+int yylex (void) { return std::getchar (); }
 void yyerror (const char *s) { return; }
 %}
 %%


hooks/post-receive
-- 
GNU Automake