[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-618-g70540a5

[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=70540a5370b3b729662047cc9a4c3313010ed37c

The branch, branch-1.11 has been updated
       via  70540a5370b3b729662047cc9a4c3313010ed37c (commit)
       via  eae36caf547319469b378d12b90a9f82338fa322 (commit)
       via  77d7a6f7ddd3feec2913d3b190e5d22c3629a155 (commit)
      from  48257ae6bfd5131d0b5dbd0ab1e2751896391d2f (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 70540a5370b3b729662047cc9a4c3313010ed37c
Merge: 48257ae eae36ca
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 12 19:31:37 2011 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      tests: fix spurious error in 'uninstall-fail.test' on Solaris
      tests: fix typo in 'uninstall-fail.test'

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

Summary of changes:
 ChangeLog                 |   13 +++++++++++++
 tests/uninstall-fail.test |   21 ++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97ffc15..b5f62fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-11-12  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious error in 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: Solaris 10 /usr/xpg4/bin/sh can add
+       a line number before the `:' in the error messages issued by shell
+       builtins.  Account for that in our grepping of make output.
+
+2011-11-12  Stefano Lattarini  <address@hidden>
+
+       tests: fix typo in 'uninstall-fail.test'
+       * tests/uninstall-fail.test: Always use `$rm_f_is_silent_on_error'
+       instead of the bogus `$rm_f_is_silent_on_failure'.
+
 2011-11-10  Stefano Lattarini  <address@hidden>
 
        tests: avoid a spurious failure of 'ltinit.test' MinGW
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index a4a058a..529d8f3 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -65,7 +65,7 @@ mkdir $inst $inst/share
 chmod a-w $inst/share
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
-if test $rm_f_is_silent_on_failure = yes; then
+if test $rm_f_is_silent_on_error = yes; then
   : "rm -f" is silent on errors, skip the grepping of make output
 else
   grep "rm: .*foobar\.txt" output
@@ -76,8 +76,23 @@ chmod a-rwx $inst/share
 
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
+#
 # Some shells, like Solaris 10 /bin/sh and /bin/ksh, do not report
-# the name of the `cd' builtin upon a chdir error.
-$EGREP "(cd|sh): .*$inst/share" output
+# the name of the `cd' builtin upon a chdir error:
+#
+#   $ /bin/sh -c 'cd /none'
+#   /bin/sh: /none: does not exist
+#
+# In addition, some shells, like Solaris 10 /usr/xpg4/bin/sh, also print
+# a line number in the error message *if the command contains newlines*:
+#
+#   $ /usr/xpg4/bin/sh -c 'cd unreadable'
+#   /usr/xpg4/bin/sh: unreadable: permission denied
+#   $ /usr/xpg4/bin/sh -c '\
+#   > \
+#   > cd unreadable'
+#   /usr/xpg4/bin/sh[3]: unreadable: permission denied
+#
+$EGREP "(cd|sh)(\[[0-9]*[0-9]\])?: .*$inst/share" output
 
 :


hooks/post-receive
-- 
GNU Automake