[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-711-gfd22dca

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

The branch, master has been updated
       via  fd22dca159cfa10ecbb822d0dd6cc677cf333aab (commit)
       via  e6ca61c1a1bf601cfde4b67c33fe861cafff7450 (commit)
      from  95ce684f09a47df6fc165311c5372066e0e28f9f (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 fd22dca159cfa10ecbb822d0dd6cc677cf333aab
Merge: 95ce684 e6ca61c
Author: Stefano Lattarini <address@hidden>
Date:   Wed Feb 23 21:38:04 2011 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog         |   11 +++++++++++
 tests/Makefile.am |    2 +-
 tests/Makefile.in |    2 +-
 tests/defs        |    4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12b8e9f..f1adebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-20  Stefano Lattarini  <address@hidden>
+
+       tests: tempdirs with restrictive permissions are cleaned correctly
+       Before this change, the removal of a temporary test directory
+       containing subdirectories with restrictive permissions (such as
+       'r--r--r--') could fail.
+       * tests/defs: Ensure that all the subdirectories of a temporary
+       test directory have the 'read', 'write' and 'execute' bits set,
+       before trying to remove it with `rm -rf'.
+       * tests/Makefile.am (clean-local-check): Likewise.
+
 2011-02-16  Stefano Lattarini  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3eb9e9..3709d47 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1015,6 +1015,6 @@ clean-local-check:
         if test "$$#,$$1" = "1,*.dir"; then \
           : there is no test directory to clean; \
         else \
-          find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
           rm -rf "$$@"; \
         fi;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1f367cd..68db8b5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1683,7 +1683,7 @@ clean-local-check:
         if test "$$#,$$1" = "1,*.dir"; then \
           : there is no test directory to clean; \
         else \
-          find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
           rm -rf "$$@"; \
         fi;
 
diff --git a/tests/defs b/tests/defs
index a32ef15..99c9b3f 100644
--- a/tests/defs
+++ b/tests/defs
@@ -464,7 +464,7 @@ esac
 testSubDir=$me.dir
 
 test ! -d $testSubDir || {
-  find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+  find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
   rm -rf $testSubDir
 }
 mkdir $testSubDir
@@ -477,7 +477,7 @@ if test "$sh_errexit_works" = yes; then
     cd "$testbuilddir"
     case $exit_status,$keep_testdirs in
     0,)
-      find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+      find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
       rm -rf $testSubDir
       ;;
     esac


hooks/post-receive
-- 
GNU Automake