From 8c847995faf850c9dab590d7c4d1600f4d1406cf Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Fri, 24 May 2024 12:57:43 +0100 Subject: make: fix tests for BSD A couple of tests require backslashes to be escaped. The test for CURDIR should use 'pwd -P' to resolve symlinks. --- testsuite/make.tests | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/make.tests b/testsuite/make.tests index ba3855973..33e730602 100755 --- a/testsuite/make.tests +++ b/testsuite/make.tests @@ -370,10 +370,10 @@ testing "make replace escaped NL in macro in command with space" \ "make -f -" \ "a b a b\n" "" ' M=word -N=${M:word=a\ +N=${M:word=a\\ b} target: - @echo ${N} ${M:word=a\ + @echo ${N} ${M:word=a\\ b} ' @@ -382,7 +382,7 @@ testing "make CURDIR macro" \ "make -f -" \ "OK\n" "" ' target: - @test "$(CURDIR)" = "$$(pwd)" && echo OK + @test "$(CURDIR)" = "$$(pwd -P)" && echo OK ' # The CURDIR environment variable doesn't affect the macro export CURDIR=/you/are/here @@ -488,7 +488,7 @@ target: testing "make backslash-escaped hash isn't a comment" \ "make -f -" \ ": hash # hash\n" "" ' -hash = \# +hash = \\# target: : hash $(hash) hash ' -- cgit v1.2.3-55-g6feb