[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-137-gf9dae92

[Ralf Wildenhues]

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=f9dae929647a177ef65edf7113ff16b9fa429993

The branch, master has been updated
       via  f9dae929647a177ef65edf7113ff16b9fa429993 (commit)
       via  e49997642289f91ff9978cdb3c29ad98431f16e3 (commit)
       via  d14b29a7e4b0d788808a1fa54318502e9edf5864 (commit)
       via  8ff479ac3e3dd7f79d72088e8dceeec16c75240e (commit)
      from  9e966db97cd932b9e4a11ac260a0c5a49aac9c7f (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 f9dae929647a177ef65edf7113ff16b9fa429993
Author: Stefano Lattarini <address@hidden>
Date:   Sun Mar 7 15:48:10 2010 +0100

    Generated tests are now just a thin layer around other tests.
    
    * tests/Makefile.am: Rewrite the rule to generate the `*-p.test'
    test scripts so that any of them simply includes the corresponding
    `*.test' script (after setting `$parallel_tests' to `yes').
    * tests/.gitignore: Add wildcard for temporary files used in the
    generation of `*-p.test' tests.

commit e49997642289f91ff9978cdb3c29ad98431f16e3
Merge: 9e966db97cd932b9e4a11ac260a0c5a49aac9c7f 
d14b29a7e4b0d788808a1fa54318502e9edf5864
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 4 08:44:53 2010 +0200

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog         |   22 ++++++++++++++++++++++
 Makefile.am       |    7 ++++---
 Makefile.in       |    7 ++++---
 tests/.gitignore  |    1 +
 tests/Makefile.am |   12 ++++++++----
 tests/Makefile.in |   12 ++++++++----
 6 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be5dbae..a5b5426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-04-04  Stefano Lattarini  <address@hidden>
+
+       Generated tests are now just a thin layer around other tests.
+       * tests/Makefile.am: Rewrite the rule to generate the `*-p.test'
+       test scripts so that any of them simply includes the corresponding
+       `*.test' script (after setting `$parallel_tests' to `yes').
+       * tests/.gitignore: Add wildcard for temporary files used in the
+       generation of `*-p.test' tests.
+
+2010-03-30  Stefano Lattarini  <address@hidden>
+
+       Avoid an unportable use of `$status' shell variable.
+       * Makefile.am (path-check): Don't use the `$status' shell variable
+       in the target's rules, as it's special in Zsh (equivalent to `$?',
+       and readonly).
+
+       Avoid another use of `chmod -R'.
+       * Makefile.am (path-check): To be safe, do not use `chmod -R' on
+       $(distdir) before removing it (as Solaris `chmod -R' touches
+       symlink targets).  Instead, use the cleanup strategy used in
+       distdir.am.
+
 2010-03-28  Ralf Wildenhues  <address@hidden>
 
        Remove uses of @acronym and @sc.
diff --git a/Makefile.am b/Makefile.am
index 08047d2..6c24285 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -534,9 +534,10 @@ path-check: distdir
 ## FIXME there's got to be a better way!  pathchk should take the list
 ## of files on stdin, at least.
          find . -print | xargs pathchk -p); \
-         status=$$?; \
-         chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
-         exit $$status
+         estatus=$$?; \
+         find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+         rm -rf $(distdir); \
+         exit $$estatus
 
 ## Program to use to fetch files.
 WGET = wget
diff --git a/Makefile.in b/Makefile.in
index 6a96eb4..d4aa111 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1245,9 +1245,10 @@ git-diff:
 path-check: distdir
        (cd $(distdir) && \
          find . -print | xargs pathchk -p); \
-         status=$$?; \
-         chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
-         exit $$status
+         estatus=$$?; \
+         find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+         rm -rf $(distdir); \
+         exit $$estatus
 
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1
diff --git a/tests/.gitignore b/tests/.gitignore
index 3c1f990..61b0783 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -6,3 +6,4 @@ parallel-tests.am
 *.log
 *.log-t
 *-p.test
+*-p.test-t
diff --git a/tests/Makefile.am b/tests/Makefile.am
index acc979c..62ad6aa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,11 +28,15 @@ include $(srcdir)/parallel-tests.am
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
        $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 
-$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
+$(parallel_tests): Makefile.am
+       $(AM_V_at)rm -f $@ address@hidden
        $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
-       sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
-         < $(srcdir)/$$input >$@
-       $(AM_V_at)chmod a+rx $@
+       { echo '#!/bin/sh'; \
+         echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+         echo 'parallel_tests=yes'; \
+         echo ". '$(srcdir)/$$input'"; \
+       } > address@hidden
+       $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
 MAINTAINERCLEANFILES = $(parallel_tests)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1d70152..295d259 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1374,11 +1374,15 @@ uninstall-am:
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
        $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 
-$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
+$(parallel_tests): Makefile.am
+       $(AM_V_at)rm -f $@ address@hidden
        $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
-       sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
-         < $(srcdir)/$$input >$@
-       $(AM_V_at)chmod a+rx $@
+       { echo '#!/bin/sh'; \
+         echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+         echo 'parallel_tests=yes'; \
+         echo ". '$(srcdir)/$$input'"; \
+       } > address@hidden
+       $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
 clean-local: clean-local-check
 .PHONY: clean-local-check


hooks/post-receive
-- 
GNU Automake