[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-529-g549f384

[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=549f3844cc9bca0dfd28d5631e0229922c7e709f

The branch, maint has been updated
       via  549f3844cc9bca0dfd28d5631e0229922c7e709f (commit)
       via  00eb9d62eb40a0c6c5962279fe0978bd76eec2c3 (commit)
       via  f6195336ab991069afc63a06c1cee03699ae4b4c (commit)
      from  1ba50d12baadb27e463c6e6c73bf19ddd53c65e4 (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 549f3844cc9bca0dfd28d5631e0229922c7e709f
Merge: f619533 00eb9d6
Author: Stefano Lattarini <address@hidden>
Date:   Mon Nov 7 16:07:25 2011 +0100

    Merge branch 'fix-pr9579' into maint
    
    * fix-pr9579:
      tests: fix spurious failure in 'distcheck-override-infodir.test'

commit 00eb9d62eb40a0c6c5962279fe0978bd76eec2c3
Author: Stefano Lattarini <address@hidden>
Date:   Mon Nov 7 16:05:48 2011 +0100

    tests: fix spurious failure in 'distcheck-override-infodir.test'
    
    * tests/distcheck-override-infodir.test ($required): Add
    'install-info'.

commit f6195336ab991069afc63a06c1cee03699ae4b4c
Author: Stefano Lattarini <address@hidden>
Date:   Mon Nov 7 15:59:43 2011 +0100

    tests: avoid another failure of 'uninstall-fail.test' on Solaris
    
    * tests/uninstall-fail.test: On Solaris 10, if `/bin/rm' is run
    with the `-f' option, it doesn't print any error message when
    failing to remove a file (due to e.g., "Permission denied").
    Yikes.  Cater to this incompatibility, by relaxing the test when
    a faulty `rm' is detected.

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

Summary of changes:
 ChangeLog                             |   15 +++++++++++++++
 tests/distcheck-override-infodir.test |    2 +-
 tests/uninstall-fail.test             |   20 ++++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d780496..cc917f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-11-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'distcheck-override-infodir.test'
+       * tests/distcheck-override-infodir.test ($required): Add
+       'install-info'.
+
+2011-11-07  Stefano Lattarini  <address@hidden>
+
+       tests: avoid another failure of 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: On Solaris 10, if `/bin/rm' is run
+       with the `-f' option, it doesn't print any error message when
+       failing to remove a file (due to e.g., "Permission denied").
+       Yikes.  Cater to this incompatibility, by relaxing the test when
+       a faulty `rm' is detected.
+
 2011-11-03  Zack Weinberg <address@hidden>  (tiny change)
            Stefano Lattarini  <address@hidden>
 
diff --git a/tests/distcheck-override-infodir.test 
b/tests/distcheck-override-infodir.test
index 8c54cfb..19ad3d1 100755
--- a/tests/distcheck-override-infodir.test
+++ b/tests/distcheck-override-infodir.test
@@ -17,7 +17,7 @@
 # Check that we can override ${infodir} while having distcheck still
 # working.  Relate to automake bug#9579.
 
-required='makeinfo tex texi2dvi'
+required='makeinfo tex texi2dvi install-info'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index 14a843b..a4a058a 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -27,7 +27,19 @@ set -e
 mkdir d
 : > d/f
 chmod a-w d || skip "cannot make directories unwritable"
-rm -f d/f && skip_ "can delete files from unwritable directories"
+
+# On Solaris 10, if `/bin/rm' is run with the `-f' option, it doesn't
+# print any error message when failing to remove a file (due to e.g.,
+# "Permission denied").  Yikes.  We'll cater to this incompatibility
+# by relaxing a test below if a faulty `rm' is detected.
+st=0; rm -f d/f 2>stderr || st=$?
+cat stderr >&2
+test $st -gt 0 || skip_ "can delete files from unwritable directories"
+if grep 'rm:' stderr; then
+  rm_f_is_silent_on_error=no
+else
+  rm_f_is_silent_on_error=yes
+fi
 
 cat >> configure.in << 'END'
 AC_OUTPUT
@@ -53,7 +65,11 @@ mkdir $inst $inst/share
 chmod a-w $inst/share
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
-grep "rm: .*foobar\.txt" output
+if test $rm_f_is_silent_on_failure = yes; then
+  : "rm -f" is silent on errors, skip the grepping of make output
+else
+  grep "rm: .*foobar\.txt" output
+fi
 
 chmod a-rwx $inst/share
 (cd $inst/share) && skip_ "cannot make directories fully unreadable"


hooks/post-receive
-- 
GNU Automake