Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): move MAKEFLAGS handling in vardebug test to the test itself

This commit is contained in:
rillig 2020-10-29 18:19:41 +00:00
parent 78256667f4
commit d24669de54
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/unit-tests/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.175 2020/10/24 02:25:02 rillig Exp $
# $NetBSD: Makefile,v 1.176 2020/10/29 18:19:41 rillig Exp $
#
# Unit tests for make(1)
#
@ -397,7 +397,6 @@ FLAGS.opt-warnings-as-errors= -W
FLAGS.order= -j1
FLAGS.recursive= -dL
FLAGS.sh-leading-plus= -n
FLAGS.vardebug= -k -dv FROM_CMDLINE=
FLAGS.varmod-match-escape= -dv
FLAGS.varname-dot-shell= -dpv
FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmline-plain'
@ -439,7 +438,6 @@ SED_CMDS.varname-dot-shell+= -e 's,\[/[^]]*\],[(details omitted)],'
# Some tests need an additional round of postprocessing.
POSTPROC.deptgt-suffixes= \
${TOOL_SED} -n -e '/^\#\*\*\* Suffixes/,/^\#\*/p'
POSTPROC.vardebug= ${TOOL_SED} -n -e '/:RELEVANT = yes/,/:RELEVANT = no/p'
POSTPROC.varmod-match-escape= ${TOOL_SED} -n -e '/^Pattern/p'
POSTPROC.varname= ${TOOL_SED} -n -e '/^MAGIC/p' -e '/^ORDER_/p'
POSTPROC.varname-dot-shell= \

9
usr.bin/make/unit-tests/vardebug.exp
View File

@ -1,4 +1,6 @@
Global:RELEVANT = yes
Global:delete FROM_CMDLINE (not found)
Command:FROM_CMDLINE =
Global:.MAKEOVERRIDES = FROM_CMDLINE
Global:VAR = added
Global:VAR = overwritten
Global:delete VAR
@ -76,5 +78,8 @@ Result of ${:unknown} is error (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_
make: "vardebug.mk" line 44: Malformed conditional (${:Uvariable:unknown})
Var_Parse: ${UNDEFINED} with VARE_UNDEFERR|VARE_WANTRES
make: "vardebug.mk" line 53: Malformed conditional (${UNDEFINED})
Global:RELEVANT = no
Global:.MAKEFLAGS = -r -k -d v -d
Global:.MAKEFLAGS = -r -k -d v -d 0
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1

6
usr.bin/make/unit-tests/vardebug.mk
View File

@ -1,8 +1,8 @@
# $NetBSD: vardebug.mk,v 1.3 2020/08/08 14:28:46 rillig Exp $
# $NetBSD: vardebug.mk,v 1.4 2020/10/29 18:19:41 rillig Exp $
#
# Demonstrates the debugging output for var.c.
RELEVANT= yes
.MAKEFLAGS: -dv FROM_CMDLINE=
VAR= added # VarAdd
VAR= overwritten # Var_Set
@ -53,7 +53,7 @@ VAR+= 3
.if ${UNDEFINED}
.endif
RELEVANT= no
.MAKEFLAGS: -d0
all:
@: