From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 16 Nov 2010 21:28:26 +0000 (+0100)
Subject: Fix two spurious testsuite failures on IRIX 6.5.
X-Git-Tag: v1.11.1b~39^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9552ab180a2ecbccd8a2439ad860838a497315aa;p=thirdparty%2Fautomake.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index ad5157168..84b9d8d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	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  <stefano.lattarini@gmail.com>
 
 	docs: cygnus mode doesn't require AM_CYGWIN32 macro.
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 784e07f80..43e67df9a 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 2b394607e..aa5a3edbf 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