From 6b9d001cdd863a5edae129846883d54bb713800e Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sat, 1 Apr 2017 23:17:26 -0700 Subject: [PATCH] t/Makefile: compute TG-TEST-SETTINGS differently Use a less gnuish mechanism to compute TG-TEST-SETTINGS. Signed-off-by: Kyle J. McKay --- t/Makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/t/Makefile b/t/Makefile index 1a41893..00ad3ac 100644 --- a/t/Makefile +++ b/t/Makefile @@ -199,21 +199,22 @@ aggregate-results: # Provide Makefile-determined settings in a test-available format -define TEST_SETTINGS -: "$${SHELL_PATH:=$(SHELL_PATH)}" -: "$${PERL_PATH:=$(PERL_PATH)}" "$${PERL_PATH:=perl}" -: "$${GIT_PATH:=$(GIT_PATH)}" "$${GIT_PATH:=git}" -: "$${DIFF:=$(DIFF)}" -: "$${TESTLIB_NO_TOLERATE=$(TESTLIB_NO_TOLERATE)}" -: "$${GIT_MINIMUM_VERSION:=$(GIT_MINIMUM_VERSION)}" "$${GIT_MINIMUM_VERSION:=$$TG_GIT_MINIMUM_VERSION}" -: "$${TG_TEST_INSTALLED=$(TG_TEST_INSTALLED)}" -endef -export TEST_SETTINGS +TEST_SETTINGS = : \ + "$${SHELL_PATH:=$(SHELL_PATH)}" \ + "$${PERL_PATH:=$(PERL_PATH)}" \ + "$${PERL_PATH:=perl}" \ + "$${GIT_PATH:=$(GIT_PATH)}" \ + "$${GIT_PATH:=git}" \ + "$${DIFF:=$(DIFF)}" \ + "$${TESTLIB_NO_TOLERATE=$(TESTLIB_NO_TOLERATE)}" \ + "$${GIT_MINIMUM_VERSION:=$(GIT_MINIMUM_VERSION)}" \ + "$${GIT_MINIMUM_VERSION:=$$TG_GIT_MINIMUM_VERSION}" \ +#TEST_SETTINGS" TG-TEST-SETTINGS: FORCE - @if test x"$$TEST_SETTINGS" != x"`cat $@ 2>/dev/null`"; then \ + @if test x'$(TEST_SETTINGS)' != x"`cat \"$@\" 2>/dev/null`"; then \ echo "* new test settings"; \ - echo "$$TEST_SETTINGS" >$@; \ + printf '%s\n' '$(TEST_SETTINGS)' >"$@"; \ fi .PHONY: FORCE -- 2.11.4.GIT