[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11b-6-gecd851d

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

The branch, master has been updated
       via  ecd851d12a0b77e9e96f8451db69812735de25c9 (commit)
       via  8036e5a14904b1a0ea97be52cc83a33c9955f3fb (commit)
       via  b35dca6bf9910b3e7ced1ce485772c3336255c24 (commit)
       via  68be923ceda6b4458123bd74c4fb5eb71589db00 (commit)
       via  ee6eb9fa97eab1c826a2501fad564f5b28bc3cb9 (commit)
      from  66cccef3098d034f6c1b271f3c2e7399c5ac72d4 (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 ecd851d12a0b77e9e96f8451db69812735de25c9
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 21:21:39 2012 +0200

    fixup: some weaknesses in a self-check test case
    
    * t/self-check-cleanup.tap: This test contained several buglets
    introduced in the recent row of commits that converted the Automake
    build system to a non-recursive setup.  Fix them.  Since we are at
    it, enhance the test to cover also the use of the 'keep_testdirs'
    environment variable in order to keep the temporary test directories
    around.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 8036e5a14904b1a0ea97be52cc83a33c9955f3fb
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 21:01:39 2012 +0200

    maintcheck: avoid yet more spurious failures (2)
    
    Some maintainer checks were too greedy in processing 'Makefile.am'
    files, looking for them even in temporary directories left behind
    by the test cases, thus causing occasional spurious failures.
    
    * syntax-checks.mk (ams): Ignore 'Makefile.am' files in the
    temporary test directories.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit b35dca6bf9910b3e7ced1ce485772c3336255c24
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 20:38:39 2012 +0200

    maintcheck: avoid yet more spurious failures (1)
    
    The 'sc_tests_makefile_variable_order' maintainer check is too
    strict sometimes, blaming automake for outputting out-of-order
    variables when this is in fact due to the result of post-processing
    of third-party tools or custom test code.
    
    * t/tap-doc2.sh: Ensure the final Makefile.in (that we hack by
    hand) is removed, to avoid a spurious maintainer-check failure.
    * t/gettext-macros.sh: Ensure that any leftover Makefile.in (that
    is generated by gettext/autopoint) is removed, to avoid a spurious
    maintainer-check failure.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 68be923ceda6b4458123bd74c4fb5eb71589db00
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 20:21:35 2012 +0200

    hacking: fixlets w.r.t. the release procedure
    
    * HACKING  (Release procedure): Do not state that the result of
    "make fetch" is woefully incomplete: this is not true anymore today.
    Suggest to re-run the testsuite after a "make fetch", in case any
    file has been updated.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ee6eb9fa97eab1c826a2501fad564f5b28bc3cb9
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 19:18:21 2012 +0200

    maintcheck: fix spurious failures
    
    * syntax-check.mk (sc_mkinstalldirs): Now the 'mkinstalldirs' is
    listed in the top-level 'Makefile.am', not in 'lib/Makefile.am';
    adjust the "whitelist" accordingly.
    (sc_ensure_testsuite_has_run): The 'test-suite.log' file created by
    "make check" is now placed in the top-level directory, not in the
    't/' subdirectory.  Adjust by using '$(TEST_SUITE_LOG)' instead of
    an hand-crafted path for the 'test-suite.log' file.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 HACKING                  |    6 +++---
 syntax-checks.mk         |    6 +++---
 t/gettext-macros.sh      |    4 ++++
 t/self-check-cleanup.tap |   30 ++++++++++++++++++++----------
 t/tap-doc2.sh            |    2 ++
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/HACKING b/HACKING
index 8d3471f..c57da67 100644
--- a/HACKING
+++ b/HACKING
@@ -219,9 +219,9 @@
   releases as well.  Where differences are expected, they will be
   explicitly described.
 
-* Fetch new versions of the files that are maintained by the FSF.
-  Commit.  Unfortunately you need an FSF account to do this.
-  (You can also use "make fetch", but that is still woefully incomplete.)
+* Fetch new versions of the files that are maintained by the FSF by
+  running "make fetch".  In case any file in the automake repository
+  has been updated, commit and re-run the testsuite.
 
 * Update NEWS.
 
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 11b2225..3a6d9dd 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -33,7 +33,7 @@ xtests := $(shell \
 
 xdefs = $(srcdir)/defs $(srcdir)/defs-static.in
 
-ams := $(shell find $(srcdir) -name '*.am')
+ams := $(shell find $(srcdir) '(' -name '*.dir' -prune ')' -a -name '*.am')
 
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
@@ -206,7 +206,7 @@ sc_no_for_variable_in_macro:
 sc_mkinstalldirs:
        @if grep -n 'mkinstalldirs' $(ams) \
              | grep -F -v '$$(mkinstalldirs)' \
-             | grep -v '^\./lib/Makefile.am:[0-9][0-9]*:  *mkinstalldirs 
\\$$'; \
+             | grep -v '^\./Makefile.am:[0-9][0-9]*:  *lib/mkinstalldirs 
\\$$'; \
        then \
          echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
          exit 1; \
@@ -500,7 +500,7 @@ sc_tests_no_configure_in:
 ## AM_RECURSIVE_TARGETS.  Suggest keeping test directories around for
 ## greppability of the Makefile.in files.
 sc_ensure_testsuite_has_run:
-       @if test ! -f t/test-suite.log; then \
+       @if test ! -f '$(TEST_SUITE_LOG)'; then \
          echo 'Run "env keep_testdirs=yes make check" before' \
               'running "make maintainer-check"' >&2; \
          exit 1; \
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 38749d3..8adcb0d 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -86,6 +86,10 @@ $ACLOCAL --force -I m4 || cat >> get.sh <<'END'
 ACLOCAL="$ACLOCAL -Wno-syntax"
 END
 
+# Remove any Makefile.in possibly created by gettextize/autopoint, to
+# avoid spurious maintainer-check failures.
+rm -f `find . -name Makefile.in`
+
 # The file gettextize or autopoint might have copied in the 'm4'
 # subdirectory of the test directory are going to be needed by
 # other tests, so we must not remove the test directory.
diff --git a/t/self-check-cleanup.tap b/t/self-check-cleanup.tap
index 3ea5281..5ea1a6e 100755
--- a/t/self-check-cleanup.tap
+++ b/t/self-check-cleanup.tap
@@ -23,7 +23,7 @@ if test x"$sh_errexit_works" != x"yes"; then
   skip_all_ "$me: no working exit trap with 'set -e'"
 fi
 
-plan_ 42
+plan_ 43
 
 # We still need a little hack to make ./defs work outside automake's
 # tree 'tests' subdirectory.  Not a big deal.
@@ -48,11 +48,21 @@ do_clean ()
   # Don't try to be smart and use find here, that has caused issues
   # and extra ERROR results in the past.  Be dumb and safe.
   for d in t t/* t/*/* t/*/*/*; do
-    test ! -d t/$d || chmod u+rwx t/$d || :
+    test ! -d $d || chmod u+rwx $d || :
   done
   rm -rf t
 }
 
+# Exporting 'keep_testdirs' to "yes" in the environment should cause
+# the cleanup code not to be run, so that the temporary directories
+# are left on disk.
+command_ok_ '"keep_testdirs=yes" causes testdir to be kept around' eval '
+     keep_testdirs=yes $SHELL -c ". ./defs && echo okok >foo" t/dummy.sh \
+     && test -f t/dummy.dir/foo \
+     && test okok = `cat t/dummy.dir/foo`'
+
+do_clean
+
 # Check that pre-test cleanup works also with directories with
 # "null" permissions, and containing broken symlinks.
 mkdir t t/dummy.dir t/dummy.dir/sub
@@ -68,11 +78,11 @@ chmod 000 t/dummy.dir/sub/* t/dummy.dir/file
 test $have_symlinks = yes && chmod 000 t/dummy.dir/symlink
 chmod 500 t/dummy.dir/sub t/dummy.dir
 command_ok_ "pre-cleanup can deal with low-perms testdir" \
-            $SHELL -c  '. ./defs' dummy.sh
+            $SHELL -c  '. ./defs' t/dummy.sh
 command_ok_ "pre-cleanup removed low-perms testdir" \
-            eval 'test ! -f dummy.dir \
-               && test ! -d dummy.dir \
-               && test ! -r dummy.dir'
+            eval 'test ! -f t/dummy.dir \
+               && test ! -d t/dummy.dir \
+               && test ! -r t/dummy.dir'
 
 do_clean
 
@@ -97,9 +107,9 @@ command_ok_ "post-cleanup can deal with low-perms testdir" \
   :
 ' t/dummy.sh
 command_ok_ "post-cleanup removed null-perms testdir" \
-            eval 'test ! -f dummy.dir \
-               && test ! -d dummy.dir \
-               && test ! -r dummy.dir'
+            eval 'test ! -f t/dummy.dir \
+               && test ! -d t/dummy.dir \
+               && test ! -r t/dummy.dir'
 
 do_clean
 
@@ -116,7 +126,7 @@ if test $have_symlinks = yes; then
   (cd t/dummy.dir && ln -s ../../dir ../../file .)
 
   command_ok_ "pre-cleanup with testdir with zero-perms symlinks" \
-               $SHELL -c '. ./defs' dummy.sh
+               $SHELL -c '. ./defs' t/dummy.sh
   ls -l # For debugging.
   command_ok_ "pre-cleanup chmod doesn't follow symlinks to files" \
                eval 'ls -l file | grep "^----------.*file"'
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index 76e1ade..2232712 100755
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -137,4 +137,6 @@ echo AM_TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile.in
 ./config.status Makefile
 $MAKE distcheck
 
+rm -f Makefile.in # To avoid a maintainer-check failure.
+
 :


hooks/post-receive
-- 
GNU Automake