This patch fixes a spurious testsuite failure on Solaris. Applied to a temporary bug-fixing branch off of `v1.11-375-g474aad0', merged to maint, and pushed.
Regards, Stefano
From d9e4f1ec7d87ed96bb663c883ee3dd96e56affa9 Mon Sep 17 00:00:00 2001 Message-Id: <d9e4f1ec7d87ed96bb663c883ee3dd96e56affa9.1312791742.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Mon, 8 Aug 2011 10:20:47 +0200 Subject: [PATCH] tests: fix spurious failure with Solaris make * tests/distcheck-configure-flags-am.test: Avoid using `+=' too liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks so introduced, in conjunction with single quotes, might confuse Solaris make. --- ChangeLog | 8 ++++++++ tests/distcheck-configure-flags-am.test | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fabd7d..5ee2a16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-08-08 Stefano Lattarini <stefano.lattar...@gmail.com> + + tests: fix spurious failure with Solaris make + * tests/distcheck-configure-flags-am.test: Avoid using `+=' too + liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks + so introduced, in conjunction with single quotes, might confuse + Solaris make. + 2011-06-18 Stefano Lattarini <stefano.lattar...@gmail.com> docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases diff --git a/tests/distcheck-configure-flags-am.test b/tests/distcheck-configure-flags-am.test index a5cab6a..dc31ee3 100755 --- a/tests/distcheck-configure-flags-am.test +++ b/tests/distcheck-configure-flags-am.test @@ -32,7 +32,9 @@ END unset sentence || : cat > Makefile.am << 'END' -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-success sentence='it works :-)' +AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2) +dc_flags1 = --enable-success sentence='it works :-)' +dc_flags2 = END $ACLOCAL @@ -54,7 +56,7 @@ $MAKE distcheck # $(AM_DISTCHECK_CONFIGURE_FLAGS) cat >> Makefile.am << 'END' -AM_DISTCHECK_CONFIGURE_FLAGS += --disable-success +dc_flags2 += --disable-success END $AUTOMAKE Makefile ./config.status Makefile -- 1.7.2.3
