[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-503-g7a77058

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

The branch, maint has been updated
       via  7a770586e81edba77ebdbd83fb6ca6fed39d2fab (commit)
       via  8c021e00169da8802d47e9428e282aa6ff78b656 (commit)
      from  94ad7e48dc63321ca334e71c0f87dc3eada8ffd6 (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 7a770586e81edba77ebdbd83fb6ca6fed39d2fab
Merge: 94ad7e4 8c021e0
Author: Stefano Lattarini <address@hidden>
Date:   Wed Oct 19 13:43:46 2011 +0200

    Merge branch 'fix-pr9578' into maint
    
    * fix-pr9578:
      tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin

commit 8c021e00169da8802d47e9428e282aa6ff78b656
Author: Stefano Lattarini <address@hidden>
Date:   Wed Oct 19 13:42:40 2011 +0200

    tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
    
    * tests/uninstall-fail.test: Be sure to really skip this test
    on systems that allows files to be removed from unwritable
    directories.  Motivated by a spurious failure on Cygwin 1.5.

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

Summary of changes:
 ChangeLog                 |    7 +++++++
 tests/uninstall-fail.test |    8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2ecefc..6d63637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-19  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
+       * tests/uninstall-fail.test: Be sure to really skip this test
+       on systems that allows files to be removed from unwritable
+       directories.  Motivated by a spurious failure on Cygwin 1.5.
+
 2011-10-17  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious failure with autoconf 2.62
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index a3e7a7a..a57b665 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -24,6 +24,11 @@
 
 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"
+
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
@@ -46,9 +51,6 @@ mkdir $inst $inst/share
 : > $inst/share/foobar.txt
 
 chmod a-w $inst/share
-touch $inst/share/t && skip_ "cannot make directories unwritable"
-rm -f $inst/share/t
-
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
 grep "rm: .*foobar\.txt" output


hooks/post-receive
-- 
GNU Automake