diff options
| author | ru <ru@FreeBSD.org> | 2003-10-02 21:30:30 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-10-02 21:30:30 +0000 |
| commit | f246003ac7f1a9c9f7ad60af2eb277214fc51f4c (patch) | |
| tree | ce7b4dd061a28517eb5677f21263ba45f59ffd29 /tools | |
| parent | 660d6cc7c1cd42f3526f3a1a124bca9801bcf306 (diff) | |
| download | FreeBSD-src-f246003ac7f1a9c9f7ad60af2eb277214fc51f4c.zip FreeBSD-src-f246003ac7f1a9c9f7ad60af2eb277214fc51f4c.tar.gz | |
Fix a bug that prevented exists() from finding "foo/", "foo/."
and "foo/.." when ".PATH: foo" was also given.
PR: bin/34062
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/make_check/Makefile | 11 | ||||
| -rw-r--r-- | tools/regression/usr.bin/make/Makefile | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index bf26b44..e7bede7 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -44,6 +44,9 @@ all: @echo "Running test arith_expr" @${MAKE} arith_expr || ${MAKE} failure @echo "PASS: Test arith_expr detected no regression." + @echo "Running test PATH_exists" + @${MAKE} PATH_exists || ${MAKE} failure + @echo "PASS: Test PATH_exists detected no regression." .if make(double) # Doubly-defined targets. make(1) will warn, but use the "right" one. If it @@ -102,6 +105,14 @@ VALUE= 0 .endif .endif +.if make(PATH_exists) +PATH_exists: +.PATH: ${.CURDIR} +.if !exists(${.CURDIR}/) || !exists(${.CURDIR}/.) || !exists(${.CURDIR}/..) +.error exists() failed +.endif +.endif + failure: @echo "FAIL: Test failed: regression detected. See above." @false diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile index bf26b44..e7bede7 100644 --- a/tools/regression/usr.bin/make/Makefile +++ b/tools/regression/usr.bin/make/Makefile @@ -44,6 +44,9 @@ all: @echo "Running test arith_expr" @${MAKE} arith_expr || ${MAKE} failure @echo "PASS: Test arith_expr detected no regression." + @echo "Running test PATH_exists" + @${MAKE} PATH_exists || ${MAKE} failure + @echo "PASS: Test PATH_exists detected no regression." .if make(double) # Doubly-defined targets. make(1) will warn, but use the "right" one. If it @@ -102,6 +105,14 @@ VALUE= 0 .endif .endif +.if make(PATH_exists) +PATH_exists: +.PATH: ${.CURDIR} +.if !exists(${.CURDIR}/) || !exists(${.CURDIR}/.) || !exists(${.CURDIR}/..) +.error exists() failed +.endif +.endif + failure: @echo "FAIL: Test failed: regression detected. See above." @false |
