d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a test for what was fixed in revision 1.27 and 1.28 of make(1)'s var.c,

Browse Source 
expansion of embedded variables in the left-hand-side of an assignment
expression, using the simplest case - hiding recursion using nil-expanded
variables.
This commit is contained in:
Juli Mallett 2002-06-19 18:57:04 +00:00
parent fe36b03b4c
commit 0aa9e01c51
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/build/make_check/Makefile
View File

@ -1,5 +1,13 @@
# $FreeBSD$
# Test for broken LHS expansion.
# This *must* case make(1) to detect a recursive variable, and fail as such.
.if make(lhs_expn)
FOO= ${BAR}
BAR${NIL}= ${FOO}
FOO${BAR}= ${FOO}
.endif
DATA1= helllo
DATA2:= ${DATA1}
DATA3= ${DATA2:S/ll/rr/g}
@ -21,6 +29,9 @@ all:
@echo "Running test sysvmatch"
@${MAKE} sysvmatch || ${MAKE} failure
@echo "PASS: Test sysvmatch detected no regression."
@echo "Running test lhs_expn"
@${MAKE} lhs_expn || ${MAKE} failure
@echo "PASS: Test lhs_expn detected no regression."
# Doubly-defined targets. NetBSD make(1) will warn, ours will silently use the
# ``right'' one.
@ -35,6 +46,12 @@ sysvmatch:
@echo EMPTY ${NIL:=foo} LHS | \
diff -u ${.CURDIR}/regress.sysvmatch.out - || false
# A bogus target for the lhs_expn test; If this is reached, then the make(1)
# program has not errored out because of the recursion caused by not expanding
# the left-hand-side's embedded variables above.
lhs_expn:
@false
failure:
@echo "FAIL: Test failed: regression detected. See above."
@false

17
tools/regression/usr.bin/make/Makefile
View File

@ -1,5 +1,13 @@
# $FreeBSD$
# Test for broken LHS expansion.
# This *must* case make(1) to detect a recursive variable, and fail as such.
.if make(lhs_expn)
FOO= ${BAR}
BAR${NIL}= ${FOO}
FOO${BAR}= ${FOO}
.endif
DATA1= helllo
DATA2:= ${DATA1}
DATA3= ${DATA2:S/ll/rr/g}
@ -21,6 +29,9 @@ all:
@echo "Running test sysvmatch"
@${MAKE} sysvmatch || ${MAKE} failure
@echo "PASS: Test sysvmatch detected no regression."
@echo "Running test lhs_expn"
@${MAKE} lhs_expn || ${MAKE} failure
@echo "PASS: Test lhs_expn detected no regression."
# Doubly-defined targets. NetBSD make(1) will warn, ours will silently use the
# ``right'' one.
@ -35,6 +46,12 @@ sysvmatch:
@echo EMPTY ${NIL:=foo} LHS | \
diff -u ${.CURDIR}/regress.sysvmatch.out - || false
# A bogus target for the lhs_expn test; If this is reached, then the make(1)
# program has not errored out because of the recursion caused by not expanding
# the left-hand-side's embedded variables above.
lhs_expn:
@false
failure:
@echo "FAIL: Test failed: regression detected. See above."
@false