From fcb15300772146dfcb8d2f232a32989e2d24fefa Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 23 Jan 2011 11:26:50 +0100 Subject: [PATCH] tests: avoid instspc.test failures due to make's whitespace trimming * tests/instspc.test: Prepend './' when passing the test characters, to avoid leading whitespace characters to be trimmed from macros set from environment variables. Fixes testsuite failures with HP-UX, IRIX, and Tru64/OSF make. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ tests/instspc.test | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c632b4432..1118e6037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-01-23 Ralf Wildenhues + + tests: avoid instspc.test failures due to make's whitespace trimming + * tests/instspc.test: Prepend './' when passing the test + characters, to avoid leading whitespace characters to be trimmed + from macros set from environment variables. Fixes testsuite + failures with HP-UX, IRIX, and Tru64/OSF make. + 2011-01-23 Stefano Lattarini coverage: test semantics of "dummy" per-target flags diff --git a/tests/instspc.test b/tests/instspc.test index 414b3e590..7d007884f 100755 --- a/tests/instspc.test +++ b/tests/instspc.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 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 @@ -135,9 +135,13 @@ do cd "$build" + # Some make implementations eliminate leading and trailing whitespace + # from macros passed on the command line, and some eliminate leading + # whitespace from macros set from environment variables, so prepend + # './' and use the latter here. ../configure --prefix "/$file-prefix" && $MAKE && - DESTDIR=$dest file=$file $MAKE -e test-install-sep || + DESTDIR=$dest file=./$file $MAKE -e test-install-sep || eval "${test}_failures=\"\$${test}_failures$lf\$file\"" cd .. -- 2.47.2