[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-256-g9552ab1

[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=9552ab180a2ecbccd8a2439ad860838a497315aa

The branch, maint has been updated
       via  9552ab180a2ecbccd8a2439ad860838a497315aa (commit)
      from  d7430fea6a8b878b1bfdf89af561a93f2746576d (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 9552ab180a2ecbccd8a2439ad860838a497315aa
Author: Stefano Lattarini <address@hidden>
Date:   Tue Nov 16 22:28:26 2010 +0100

    Fix two spurious testsuite failures on IRIX 6.5.
    
    * tests/suffix13.test (Makefile.am): Account for VPATH issues on
    weaker make implementations (e.g. IRIX 6.5).
    * tests/parallel-tests8.test: Likewise, plus a required related
    change.
    
    Reported by Ralf Wildenhues.  The bugs have been there from the
    first versions of the affected test scripts.

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

Summary of changes:
 ChangeLog                  |   10 ++++++++++
 tests/parallel-tests8.test |    5 +++--
 tests/suffix13.test        |    3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad51571..84b9d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-12-22  Stefano Lattarini  <address@hidden>
 
+       Fix two spurious testsuite failures on IRIX 6.5.
+       * tests/suffix13.test (Makefile.am): Account for VPATH issues on
+       weaker make implementations (e.g. IRIX 6.5).
+       * tests/parallel-tests8.test: Likewise, plus a required related
+       change.
+       Reported by Ralf Wildenhues.  The bugs have been there from the
+       first versions of the affected test scripts.
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
        docs: cygnus mode doesn't require AM_CYGWIN32 macro.
        * doc/automake.texi (Cygnus): Mode 'cygnus' does not require
        the AM_CYGWIN32 macro (and indeed hasn't required it since at
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 784e07f..43e67df 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -38,7 +38,8 @@ TESTS = foo.test
 ## the next line will cause automake to error out:
 TESTS += $(srcdir)/bar.test $(top_srcdir)/baz.test
 .in.test:
-       cp $< $@
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
+       cp `test -f $< || echo $(srcdir)/`$< $@
        chmod +x $@
 check_SCRIPTS = $(TESTS)
 EXTRA_DIST = foo.in foo.test
@@ -57,7 +58,7 @@ AUTOMAKE_fails -a
 grep '(srcdir.*bar' stderr
 grep 'top_srcdir.*baz' stderr
 
-sed '/srcdir/d' < Makefile.am > t
+sed '/^TESTS +=.*srcdir/d' < Makefile.am > t
 mv -f t Makefile.am
 $AUTOMAKE -a
 
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 2b39460..aa5a3ed 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -38,7 +38,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 SUFFIXES = .baz .c
 .baz.c:
        case $@ in sub/*) $(MKDIR_P) sub;; *) :;; esac
-       cp $< $@
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
+       cp `test -f $< || echo $(srcdir)/`$< $@
 
 DISTCLEANFILES = sub/bar.c
 


hooks/post-receive
-- 
GNU Automake