diff options
author | Ron Yorston <rmy@pobox.com> | 2024-05-24 12:57:43 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-05-24 12:57:43 +0100 |
commit | 8c847995faf850c9dab590d7c4d1600f4d1406cf (patch) | |
tree | 442b3709c73709c4afb31b28c588d644f313ceeb | |
parent | 8248785e1d70b5365e2fc17e17dc2ba861c88dd1 (diff) | |
download | busybox-w32-8c847995faf850c9dab590d7c4d1600f4d1406cf.tar.gz busybox-w32-8c847995faf850c9dab590d7c4d1600f4d1406cf.tar.bz2 busybox-w32-8c847995faf850c9dab590d7c4d1600f4d1406cf.zip |
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.
-rwxr-xr-x | testsuite/make.tests | 8 |
1 files 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" \ | |||
370 | "make -f -" \ | 370 | "make -f -" \ |
371 | "a b a b\n" "" ' | 371 | "a b a b\n" "" ' |
372 | M=word | 372 | M=word |
373 | N=${M:word=a\ | 373 | N=${M:word=a\\ |
374 | b} | 374 | b} |
375 | target: | 375 | target: |
376 | @echo ${N} ${M:word=a\ | 376 | @echo ${N} ${M:word=a\\ |
377 | b} | 377 | b} |
378 | ' | 378 | ' |
379 | 379 | ||
@@ -382,7 +382,7 @@ testing "make CURDIR macro" \ | |||
382 | "make -f -" \ | 382 | "make -f -" \ |
383 | "OK\n" "" ' | 383 | "OK\n" "" ' |
384 | target: | 384 | target: |
385 | @test "$(CURDIR)" = "$$(pwd)" && echo OK | 385 | @test "$(CURDIR)" = "$$(pwd -P)" && echo OK |
386 | ' | 386 | ' |
387 | # The CURDIR environment variable doesn't affect the macro | 387 | # The CURDIR environment variable doesn't affect the macro |
388 | export CURDIR=/you/are/here | 388 | export CURDIR=/you/are/here |
@@ -488,7 +488,7 @@ target: | |||
488 | testing "make backslash-escaped hash isn't a comment" \ | 488 | testing "make backslash-escaped hash isn't a comment" \ |
489 | "make -f -" \ | 489 | "make -f -" \ |
490 | ": hash # hash\n" "" ' | 490 | ": hash # hash\n" "" ' |
491 | hash = \# | 491 | hash = \\# |
492 | target: | 492 | target: |
493 | : hash $(hash) hash | 493 | : hash $(hash) hash |
494 | ' | 494 | ' |