diff options
author | obrien <obrien@FreeBSD.org> | 2011-05-25 23:33:49 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2011-05-25 23:33:49 +0000 |
commit | 1f1269be06ecf141c9c3e60d706828f6c0951b5d (patch) | |
tree | ad053065e75e1ac9e0a06bef3a3fc4bcfa854794 /tools | |
parent | b5e2a8cd97132ce3eb4e8b74243a97ec8729b4ef (diff) | |
download | FreeBSD-src-1f1269be06ecf141c9c3e60d706828f6c0951b5d.zip FreeBSD-src-1f1269be06ecf141c9c3e60d706828f6c0951b5d.tar.gz |
+ Tighten up (and simplify) the pass_cmd_vars_1 "variable definition arrived
from the calling make" test.
+ Be more tolerant of newlines in the plus_flag "supports the '+' flag" test.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build/make_check/Makefile | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index e57e70c..cc8ca6b 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.MAKE.MODE= normal + # Test for broken LHS expansion. # This *must* cause make(1) to detect a recursive variable, and fail as such. .if make(lhs_expn) @@ -152,24 +154,19 @@ pass_cmd_vars: @${SMAKE} CMD1=cmd1 CMD2=cmd2 pass_cmd_vars_4 .endif -.if make(pass_cmd_vars_1) +# # Check that the variable definition arrived from the calling make +# +.if make(pass_cmd_vars_1) +# These values should get overridden by the commandline +CMD1=oops1 +CMD2=oops2 pass_cmd_vars_1: @: .if ${CMD1} != cmd1 || ${CMD2} != cmd2 .error variables not passed through MAKEFLAGS .endif - -# Check that the variable definition is in MAKEFLAGS -.if ${.MAKEFLAGS:MCMD1=*} != "CMD1=cmd1" || ${.MAKEFLAGS:MCMD2=*} != "CMD2=cmd2" -.error variable assignment not found in $${MAKEFLAGS} -.endif - -# Check that the variable definition is not in MFLAGS -.if ${MFLAGS:MCMD1=*} != "" || ${MFLAGS:MCMD2=*} != "" -.error variable assignment found in $${MFLAGS} -.endif .endif .if make(pass_cmd_vars_2) @@ -228,7 +225,7 @@ pass_cmd_vars_4_1: # .if make(plus_flag) OUT != ${SMAKE} -n plus_flag_1 -.if ${OUT} != "/tmp" +.if ${OUT:M/tmp} != "/tmp" .error make doesn't handle + flag .endif plus_flag: |