[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.1-198-gb3a5c6b

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

The branch, master has been updated
       via  b3a5c6b4973209af0aa125f8916fff4070080ee9 (commit)
       via  bbd192421043a482f00e9532de2a127c708323cf (commit)
       via  51ea4f3ffc52524f88e01fd9e583e90fd2a537b7 (commit)
      from  5e0539a3cc36e426e315ebf55df95b78f4822235 (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 b3a5c6b4973209af0aa125f8916fff4070080ee9
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 3 23:48:47 2012 +0200

    tests: make 't/aclocal-macrodir.tap' executable
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit bbd192421043a482f00e9532de2a127c708323cf
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 3 23:22:46 2012 +0200

    maintcheck: fix spurious failure in 'maintainer-check-list-of-tests'
    
    * Makefile.am (test_subdirs): Add 'contrib/t', otherwise we would get a
    spurious error like:
    
      List of tests in Makefile an on filesystem differ
      + diff -u in-makefile on-filesystem
      --- tests-in-makefile-list.tmp    2012-07-03 23:07:47.000000000 +0200
      +++ tests-on-filesystem-list.tmp  2012-07-03 23:07:47.000000000 +0200
      @@ -1,7 +1,3 @@
      -contrib/t/help-multilib.sh
      -contrib/t/multilib.sh
      -contrib/t/parallel-tests-html-recursive.sh
      -contrib/t/parallel-tests-html.sh
       t/ac-output-old.tap
       t/acloca10.sh
       t/acloca11.sh
      make: *** [maintainer-check-list-of-tests] Error 1
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 51ea4f3ffc52524f88e01fd9e583e90fd2a537b7
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 3 21:56:08 2012 +0200

    build: fix cleaning of test directories in contrib (and in t/perf)
    
    * Makefile.am (clean-local-check): Update recipe to cater to the fact
    that some tests using a temporary directory have been placed in other
    directories that the 't/' directory (for the moment, at least 't/perf'
    and 'contrib/t').
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 Makefile.am            |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 t/aclocal-macrodir.tap

diff --git a/Makefile.am b/Makefile.am
index f05e82d..44a6aca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -421,7 +421,7 @@ check-local: check-no-repeated-test-name
 .PHONY: check-no-repeated-test-name
 
 ## Checking the list of tests.
-test_subdirs = t t/pm t/perf
+test_subdirs = t t/pm t/perf contrib/t
 include $(srcdir)/t/CheckListOfTests.am
 
 # Run the testsuite with the installed aclocal and automake.
@@ -432,13 +432,16 @@ installcheck-testsuite:
 clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:
-       -set x t/*.dir; shift; \
-        if test "$$#,$$1" = "1,*.dir"; then \
-          : there is no test directory to clean; \
-        else \
-          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
-          rm -rf "$$@"; \
-        fi;
+## Directries candidate to be test directories match this wildcard.
+       @globs='t/*.dir t/*/*.dir */t/*.dir */t/*/*.dir'; \
+## The 'nullglob' bash option is not portable, so use perl.
+       dirs=`$(PERL) -e "print join(' ', glob('$$globs'));"` || exit 1; \
+       if test -n "$$dirs"; then \
+## Errors in find are acceptable, errors in rm are not.
+           find $$dirs -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
+           echo " rm -rf $$dirs"; \
+           rm -rf $$dirs || exit 1; \
+       fi
 
 
 ## ---------------- ##
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap
old mode 100644
new mode 100755


hooks/post-receive
-- 
GNU Automake