automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Testsuite failures on IRIX 6.5 (was: testsuite results from master)


From: Stefano Lattarini
Subject: Re: Testsuite failures on IRIX 6.5 (was: testsuite results from master)
Date: Tue, 16 Nov 2010 22:36:51 +0100
User-agent: KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; )

In the meantime, I've prepared a patch to fix the VPATH-related
spurious failures in parallel-tests8.test and suffix13.test.
Ralf, does it work for you?

Regards,
  Stefano
From 87e825fb00f90939b58cc9dd4eddc4a2cb9d5d0a Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Tue, 16 Nov 2010 22:28:26 +0100
Subject: [PATCH] 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.
---
 ChangeLog                  |    8 ++++++++
 tests/parallel-tests8.test |    5 +++--
 tests/suffix13.test        |    3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b69d4e5..6a9f1ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-11-16  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.
+
        Fix regression in colon{5,6}.test (failures on AIX 5.3).
        * tests/colon5.test: Also substitute address@hidden@' with `$SHELL' when
        post-processing the generated Makefile.in, to work around a bug
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
 
-- 
1.7.1


reply via email to

[Prev in Thread] Current Thread [Next in Thread]