From 92c4c0c0a073fee1497ae70b8d269fc81f3884c7 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 22 Jan 2011 18:20:41 +0100 Subject: [PATCH] tests: fix VPATH auto-expansion workarounds. * tests/parallel-tests8.test, tests/suffix13.test: Ensure $< is not surrounded by white space, to prevent Solaris make from applying automatic VPATH text expansion. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ tests/parallel-tests8.test | 4 ++-- tests/suffix13.test | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84b9d8d..81d563a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-01-22 Ralf Wildenhues + + tests: fix VPATH auto-expansion workarounds. + * tests/parallel-tests8.test, tests/suffix13.test: + Ensure $< is not surrounded by white space, to prevent Solaris + make from applying automatic VPATH text expansion. + 2010-12-22 Stefano Lattarini Fix two spurious testsuite failures on IRIX 6.5. diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test index 43e67df..524b82b 100755 --- a/tests/parallel-tests8.test +++ b/tests/parallel-tests8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ TESTS = foo.test TESTS += $(srcdir)/bar.test $(top_srcdir)/baz.test .in.test: ## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5) - cp `test -f $< || echo $(srcdir)/`$< $@ + cp `test -f '$<' || echo $(srcdir)/`$< $@ chmod +x $@ check_SCRIPTS = $(TESTS) EXTRA_DIST = foo.in foo.test diff --git a/tests/suffix13.test b/tests/suffix13.test index aa5a3ed..8120024 100755 --- a/tests/suffix13.test +++ b/tests/suffix13.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software Foundation, -# Inc. +# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software +# Foundation, Inc. # # This file is part of GNU Automake. # @@ -39,7 +39,7 @@ SUFFIXES = .baz .c .baz.c: case $@ in sub/*) $(MKDIR_P) sub;; *) :;; esac ## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5) - cp `test -f $< || echo $(srcdir)/`$< $@ + cp `test -f '$<' || echo $(srcdir)/`$< $@ DISTCLEANFILES = sub/bar.c -- 2.7.4