[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-504-gd91f357

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

The branch, maint has been updated
       via  d91f357d9841d2da2fe7538bbcff73bcca94435a (commit)
      from  7a770586e81edba77ebdbd83fb6ca6fed39d2fab (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 d91f357d9841d2da2fe7538bbcff73bcca94435a
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 20 17:31:11 2011 +0200

    tests: avoid spurious failure of 'uninstall-fail.test' on Solaris
    
    * tests/uninstall-fail.test: All the Solaris 10 shells (/bin/sh,
    /bin/ksh, and /usr/xpg4/bin/sh), upon failing to chdir to a
    directory with the `cd' builtin, print a message like:
      "sh: /root: permission denied"
    which doesn't report the `cd' builtin anywhere.  Relax the grepping
    of the error message accordingly.

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

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

diff --git a/ChangeLog b/ChangeLog
index 6d63637..16f72e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure of 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: All the Solaris 10 shells (/bin/sh,
+       /bin/ksh, and /usr/xpg4/bin/sh), upon failing to chdir to a
+       directory with the `cd' builtin, print a message like:
+         "sh: /root: permission denied"
+       which doesn't report the `cd' builtin anywhere.  Relax the grepping
+       of the error message accordingly.
+
 2011-10-19  Stefano Lattarini  <address@hidden>
 
        tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index a57b665..14a843b 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -60,7 +60,8 @@ chmod a-rwx $inst/share
 
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
-grep "cd: .*$inst/share" 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
 
 :


hooks/post-receive
-- 
GNU Automake