[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-542-g28f9324

[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=28f932436195d91dff2e7c7f3f589b914b55acde

The branch, master has been updated
       via  28f932436195d91dff2e7c7f3f589b914b55acde (commit)
       via  3d6cd2896c637a24a9c125ef81506d911c3087d4 (commit)
       via  080d362b919118033d054cb80b85cffc6d94cab6 (commit)
      from  3374fa0fcf0cce492762f5bd0d0392102ef36f21 (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 28f932436195d91dff2e7c7f3f589b914b55acde
Merge: 3374fa0 3d6cd28
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 18 13:43:28 2010 +0100

    Merge branch 'tests-posixsubst-specialvars'

commit 3d6cd2896c637a24a9c125ef81506d911c3087d4
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 18 13:34:23 2010 +0100

    Make test 'posixsubst-script' portable to MinGW/MSYS.
    
    * tests/posixsubst-script.test: Ensure that the generated dummy
    scripts really start with a shebang line, to work around a
    limitation of 'test -x' on MinGW/MSYS.
    
    Reported by Ralf Wildenhues.

commit 080d362b919118033d054cb80b85cffc6d94cab6
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 18 12:58:04 2010 +0100

    Improve comments in tests `posixsubst*.test'.
    
    * tests/posixsubst-data.test: Improve comment explaining why we
    try also empty match suffix.
    * tests/posixsubst-extradist.test: Likewise.
    * tests/posixsubst-ldadd.test: Likewise.
    * tests/posixsubst-libraries.test: Likewise.
    * tests/posixsubst-ltlibraries.test: Likewise.
    * tests/posixsubst-programs.test: Likewise.
    * tests/posixsubst-scripts.test: Likewise.
    * tests/posixsubst-sources.test: Likewise.
    * tests/posixsubst-tests.test: Likewise.
    
    Suggested by Ralf Wildenhues.

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

Summary of changes:
 ChangeLog                         |   21 +++++++++++++++++++++
 tests/posixsubst-data.test        |    4 ++--
 tests/posixsubst-extradist.test   |    4 ++--
 tests/posixsubst-ldadd.test       |    4 ++--
 tests/posixsubst-libraries.test   |    4 ++--
 tests/posixsubst-ltlibraries.test |    4 ++--
 tests/posixsubst-programs.test    |    4 ++--
 tests/posixsubst-scripts.test     |   24 ++++++++++++++++++------
 tests/posixsubst-sources.test     |    4 ++--
 tests/posixsubst-tests.test       |    4 ++--
 10 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13759a8..5473a93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2010-12-18  Stefano Lattarini  <address@hidden>
 
+       Make test 'posixsubst-script' portable to MinGW/MSYS.
+       * tests/posixsubst-script.test: Ensure that the generated dummy
+       scripts really start with a shebang line, to work around a
+       limitation of 'test -x' on MinGW/MSYS.
+       Reported by Ralf Wildenhues.
+
+       Improve comments in tests `posixsubst*.test'.
+       * tests/posixsubst-data.test: Improve comment explaining why we
+       try also empty match suffix.
+       * tests/posixsubst-extradist.test: Likewise.
+       * tests/posixsubst-ldadd.test: Likewise.
+       * tests/posixsubst-libraries.test: Likewise.
+       * tests/posixsubst-ltlibraries.test: Likewise.
+       * tests/posixsubst-programs.test: Likewise.
+       * tests/posixsubst-scripts.test: Likewise.
+       * tests/posixsubst-sources.test: Likewise.
+       * tests/posixsubst-tests.test: Likewise.
+       Suggested by Ralf Wildenhues.
+
+2010-12-18  Stefano Lattarini  <address@hidden>
+
        docs: fix blunder in example about python extension modules
        * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
        not `quaternion_SOURCES', to declare the sources of python
diff --git a/tests/posixsubst-data.test b/tests/posixsubst-data.test
index f1ffeae..210279f 100755
--- a/tests/posixsubst-data.test
+++ b/tests/posixsubst-data.test
@@ -36,8 +36,8 @@ bar.data bazzardoz:
        : > $@
 CLEANFILES = bar.data bazzardoz
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 dist_foo_DATA = $(t1:=.txt)
 foo_DATA = $(t2:x=.data)
 nodist_foo_DATA = $(t3:.y=zardoz)
diff --git a/tests/posixsubst-extradist.test b/tests/posixsubst-extradist.test
index c3bf970..c9a20bf 100755
--- a/tests/posixsubst-extradist.test
+++ b/tests/posixsubst-extradist.test
@@ -29,8 +29,8 @@ cat > Makefile.am << 'END'
 t1 = foo1 foo2
 t2 = bar.x
 t3 = baz-y
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 EXTRA_DIST = $(t1:=.c) $(t2:.x=.f) $(t3:-y=ar)
 bazar bar.f:
        : > $@
diff --git a/tests/posixsubst-ldadd.test b/tests/posixsubst-ldadd.test
index fa3a12c..6eb29f9 100755
--- a/tests/posixsubst-ldadd.test
+++ b/tests/posixsubst-ldadd.test
@@ -37,8 +37,8 @@ zardoz_PROGRAMS = foo bar
 
 noinst_LIBRARIES = libquux1.a libquux2.a libquux3.a
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 LDADD = $(u:.lib=.a)
 bar_LDADD = $(v:=.a) libquux2.a $(w:none=libquux3.a)
 
diff --git a/tests/posixsubst-libraries.test b/tests/posixsubst-libraries.test
index 79b96bc..90cc2e5 100755
--- a/tests/posixsubst-libraries.test
+++ b/tests/posixsubst-libraries.test
@@ -32,8 +32,8 @@ cat > Makefile.am << 'END'
 foolibs = libfoo1 libfoo2
 barlibs = libbaz
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 lib_LIBRARIES = $(foolibs:=.a) $(barlibs:z=r.a)
 
 libbar.c:
diff --git a/tests/posixsubst-ltlibraries.test 
b/tests/posixsubst-ltlibraries.test
index c482db4..93a1d57 100755
--- a/tests/posixsubst-ltlibraries.test
+++ b/tests/posixsubst-ltlibraries.test
@@ -33,8 +33,8 @@ cat > Makefile.am << 'END'
 foolibs = libfoo1 libfoo2
 barlibs = libbaz
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 lib_LTLIBRARIES = $(foolibs:=.la) $(barlibs:z=r.la)
 
 libbar.c:
diff --git a/tests/posixsubst-programs.test b/tests/posixsubst-programs.test
index a8471f6..69252dd 100755
--- a/tests/posixsubst-programs.test
+++ b/tests/posixsubst-programs.test
@@ -30,8 +30,8 @@ cat > Makefile.am << 'END'
 t1 = foo1 foo2
 t2 = barx bar2
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 bin_PROGRAMS = $(t1:=-p) $(t2:2=y)
 
 installcheck-local:
diff --git a/tests/posixsubst-scripts.test b/tests/posixsubst-scripts.test
index a6f253b..918bced 100755
--- a/tests/posixsubst-scripts.test
+++ b/tests/posixsubst-scripts.test
@@ -25,17 +25,26 @@ cat >> configure.in << 'END'
 AC_OUTPUT
 END
 
+# We have to be careful with 'test -x' commands on MinGW/MSYS, because
+# the file system does not actually have execute permission information.
+# Instead, that is emulated by looking at the file content, and returning
+# 0 if the file starts with, e.g., a COFF header or with '#!'.
+# So we need to create actual scripts in the make rules and in the file
+# creation below.
+
 cat > Makefile.am << 'END'
 t1 = foo1 foo2
 t2 = bar1x bar2
 t3 = quu-baz
 
-bar1 bar2 quux.pl:
-       : > $@
+bar1 bar2:
+       (echo '#!/bin/sh' && echo 'exit 0') > $@
+quux.pl:
+       (echo '#!/bin/perl' && echo '1;') > $@
 CLEANFILES = bar1 bar2 quux.pl
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 dist_sbin_SCRIPTS = $(t1:=.sh)
 libexec_SCRIPTS = $(t2:x=)
 nodist_bin_SCRIPTS = $(t3:-baz=x.pl)
@@ -71,8 +80,11 @@ installcheck-local:
        test -x $(prefix)/bin/quux.pl
 END
 
-: > foo1.sh
-: > foo2.sh
+cat > foo1.sh <<'END'
+#!/bin/sh
+exit 0
+END
+cp foo1.sh foo2.sh
 
 $ACLOCAL
 $AUTOCONF
diff --git a/tests/posixsubst-sources.test b/tests/posixsubst-sources.test
index 97f4e55..14d438d 100755
--- a/tests/posixsubst-sources.test
+++ b/tests/posixsubst-sources.test
@@ -33,8 +33,8 @@ FOO = foo.cxx
 BAR = bar__
 BAZ = baz.
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 foo_SOURCES = main.c $(FOO:.cxx=.c)
 dist_foo_SOURCES = $(BAR:__=.c)
 nodist_foo_SOURCES = $(BAZ:=c)
diff --git a/tests/posixsubst-tests.test b/tests/posixsubst-tests.test
index 98305ae..3fca8f4 100755
--- a/tests/posixsubst-tests.test
+++ b/tests/posixsubst-tests.test
@@ -34,8 +34,8 @@ foo2.test barz:
        (echo '#!/bin/sh' && echo 'exit 0') > $@ && chmod a+x $@
 CLEANFILES = foo2.test barz # for FreeBSD make
 
-# Try also with `:=', to ensure the parser is not unduly confused
-# into thinking that it's an unportable assignment operator.
+# Also try an empty match suffix, to ensure that the `:=' in there is
+# not confused by the parser with an unportable assignment operator.
 TESTS = $(t1:=.test) $(t2:x=y) $(t3:2=z)
 
 EXTRA_DIST = $(TESTS)


hooks/post-receive
-- 
GNU Automake