vendor/NetBSD/bmake/20200902

1 files changed, 332 insertions, 26 deletions

diff --git a/unit-tests/Makefile b/unit-tests/Makefile
index c9cc13d769db..1566b177087a 100644
--- a/unit-tests/Makefile
+++ b/unit-tests/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.60 2020/07/10 00:48:32 sjg Exp $
+# $Id: Makefile,v 1.92 2020/09/02 18:39:29 sjg Exp $
 #
-# $NetBSD: Makefile,v 1.63 2020/07/09 22:40:14 sjg Exp $
+# $NetBSD: Makefile,v 1.130 2020/09/02 05:33:57 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -25,68 +25,364 @@
 # named makefile (*.mk), with its own set of expected results (*.exp),
 # and it should be added to the TESTS list.
 #
-# Any added files must also be added to src/distrib/sets/lists/tests/mi.
-# Makefiles that are not added to TESTS must be ignored in
-# src/tests/usr.bin/make/t_make.sh (example: include-sub).
+# A few *.mk files are helper files for other tests (such as include-sub.mk)
+# and are thus not added to TESTS.  Such files must be ignored in
+# src/tests/usr.bin/make/t_make.sh.
 #
 
 # Each test is in a sub-makefile.
 # Keep the list sorted.
+# Any test that is commented out must be ignored in
+# src/tests/usr.bin/make/t_make.sh as well.
+TESTS+=		# archive	# broken on FreeBSD, enabled in t_make.sh
+TESTS+=		archive-suffix
+TESTS+=		cmd-interrupt
+TESTS+=		cmdline
 TESTS+=		comment
+TESTS+=		cond-cmp-numeric
+TESTS+=		cond-cmp-numeric-eq
+TESTS+=		cond-cmp-numeric-ge
+TESTS+=		cond-cmp-numeric-gt
+TESTS+=		cond-cmp-numeric-le
+TESTS+=		cond-cmp-numeric-lt
+TESTS+=		cond-cmp-numeric-ne
+TESTS+=		cond-cmp-string
+TESTS+=		cond-func
+TESTS+=		cond-func-commands
+TESTS+=		cond-func-defined
+TESTS+=		cond-func-empty
+TESTS+=		cond-func-exists
+TESTS+=		cond-func-make
+TESTS+=		cond-func-target
 TESTS+=		cond-late
+TESTS+=		cond-op
+TESTS+=		cond-op-and
+TESTS+=		cond-op-not
+TESTS+=		cond-op-or
+TESTS+=		cond-op-parentheses
 TESTS+=		cond-short
+TESTS+=		cond-token-number
+TESTS+=		cond-token-plain
+TESTS+=		cond-token-string
+TESTS+=		cond-token-var
 TESTS+=		cond1
 TESTS+=		cond2
+TESTS+=		counter
+TESTS+=		dep
+TESTS+=		dep-colon
+TESTS+=		dep-double-colon
+TESTS+=		dep-exclam
+TESTS+=		dep-none
+TESTS+=		dep-var
+TESTS+=		dep-wildcards
+TESTS+=		depsrc
+TESTS+=		depsrc-exec
+TESTS+=		depsrc-ignore
+TESTS+=		depsrc-made
+TESTS+=		depsrc-make
+TESTS+=		depsrc-meta
+TESTS+=		depsrc-nometa
+TESTS+=		depsrc-nometa_cmp
+TESTS+=		depsrc-nopath
+TESTS+=		depsrc-notmain
+TESTS+=		depsrc-optional
+TESTS+=		depsrc-phony
+TESTS+=		depsrc-precious
+TESTS+=		depsrc-recursive
+TESTS+=		depsrc-silent
+TESTS+=		depsrc-use
+TESTS+=		depsrc-usebefore
+TESTS+=		depsrc-usebefore-double-colon
+TESTS+=		depsrc-wait
+TESTS+=		deptgt
+TESTS+=		deptgt-begin
+TESTS+=		deptgt-default
+TESTS+=		deptgt-delete_on_error
+TESTS+=		deptgt-end
+TESTS+=		deptgt-error
+TESTS+=		deptgt-ignore
+TESTS+=		deptgt-interrupt
+TESTS+=		deptgt-main
+TESTS+=		deptgt-makeflags
+TESTS+=		deptgt-no_parallel
+TESTS+=		deptgt-nopath
+TESTS+=		deptgt-notparallel
+TESTS+=		deptgt-objdir
+TESTS+=		deptgt-order
+TESTS+=		deptgt-path
+TESTS+=		deptgt-path-suffix
+TESTS+=		deptgt-phony
+TESTS+=		deptgt-precious
+TESTS+=		deptgt-shell
+TESTS+=		deptgt-silent
+TESTS+=		deptgt-stale
+TESTS+=		deptgt-suffixes
+TESTS+=		dir
+TESTS+=		dir-expand-path
+TESTS+=		directive
+TESTS+=		directive-elif
+TESTS+=		directive-elifdef
+TESTS+=		directive-elifmake
+TESTS+=		directive-elifndef
+TESTS+=		directive-elifnmake
+TESTS+=		directive-else
+TESTS+=		directive-endif
+TESTS+=		directive-error
+TESTS+=		directive-export
+TESTS+=		directive-export-env
+TESTS+=		directive-export-literal
+TESTS+=		directive-for
+TESTS+=		directive-for-generating-endif
+TESTS+=		directive-if
+TESTS+=		directive-ifdef
+TESTS+=		directive-ifmake
+TESTS+=		directive-ifndef
+TESTS+=		directive-ifnmake
+TESTS+=		directive-info
+TESTS+=		directive-undef
+TESTS+=		directive-unexport
+TESTS+=		directive-unexport-env
+TESTS+=		directive-warning
+TESTS+=		directives
 TESTS+=		dollar
 TESTS+=		doterror
 TESTS+=		dotwait
+TESTS+=		envfirst
 TESTS+=		error
 TESTS+=		# escape	# broken by reverting POSIX changes
 TESTS+=		export
 TESTS+=		export-all
 TESTS+=		export-env
+TESTS+=		export-variants
 TESTS+=		forloop
 TESTS+=		forsubst
 TESTS+=		hash
-TESTS+=		# impsrc	# broken by reverting POSIX changes
+TESTS+=		impsrc
 TESTS+=		include-main
+TESTS+=		lint
+TESTS+=		make-exported
 TESTS+=		misc
 TESTS+=		moderrs
 TESTS+=		modmatch
 TESTS+=		modmisc
-TESTS+=		modorder
 TESTS+=		modts
 TESTS+=		modword
+TESTS+=		opt
+TESTS+=		opt-backwards
+TESTS+=		opt-chdir
+TESTS+=		opt-debug
+TESTS+=		opt-debug-g1
+TESTS+=		opt-define
+TESTS+=		opt-env
+TESTS+=		opt-file
+TESTS+=		opt-ignore
+TESTS+=		opt-include-dir
+TESTS+=		opt-jobs
+TESTS+=		opt-jobs-internal
+TESTS+=		opt-keep-going
+TESTS+=		opt-m-include-dir
+TESTS+=		opt-no-action
+TESTS+=		opt-no-action-at-all
+TESTS+=		opt-query
+TESTS+=		opt-raw
+TESTS+=		opt-silent
+TESTS+=		opt-touch
+TESTS+=		opt-tracefile
+TESTS+=		opt-var-expanded
+TESTS+=		opt-var-literal
+TESTS+=		opt-warnings-as-errors
+TESTS+=		opt-where-am-i
+TESTS+=		opt-x-reduce-exported
 TESTS+=		order
-TESTS+=		# phony-end	# broken by reverting POSIX changes
+TESTS+=		phony-end
 TESTS+=		posix
 TESTS+=		# posix1	# broken by reverting POSIX changes
 TESTS+=		qequals
-TESTS+=		# suffixes	# broken by reverting POSIX changes
+TESTS+=		recursive
+TESTS+=		sh
+TESTS+=		sh-dots
+TESTS+=		sh-jobs
+TESTS+=		sh-jobs-error
+TESTS+=		sh-leading-at
+TESTS+=		sh-leading-hyphen
+TESTS+=		sh-leading-plus
+TESTS+=		sh-meta-chars
+TESTS+=		sh-multi-line
+TESTS+=		sh-single-line
+TESTS+=		# suffixes	# runs into an endless loop (try -dA)
 TESTS+=		sunshcmd
 TESTS+=		sysv
 TESTS+=		ternary
 TESTS+=		unexport
 TESTS+=		unexport-env
+TESTS+=		use-inference
+TESTS+=		var-class
+TESTS+=		var-class-cmdline
+TESTS+=		var-class-env
+TESTS+=		var-class-global
+TESTS+=		var-class-local
+TESTS+=		var-class-local-legacy
+TESTS+=		var-op
+TESTS+=		var-op-append
+TESTS+=		var-op-assign
+TESTS+=		var-op-default
+TESTS+=		var-op-expand
+TESTS+=		var-op-shell
 TESTS+=		varcmd
+TESTS+=		vardebug
+TESTS+=		varfind
 TESTS+=		varmisc
+TESTS+=		varmod
+TESTS+=		varmod-assign
+TESTS+=		varmod-defined
 TESTS+=		varmod-edge
+TESTS+=		varmod-exclam-shell
+TESTS+=		varmod-extension
+TESTS+=		varmod-gmtime
+TESTS+=		varmod-hash
+TESTS+=		varmod-head
+TESTS+=		varmod-ifelse
+TESTS+=		varmod-l-name-to-value
+TESTS+=		varmod-localtime
+TESTS+=		varmod-loop
+TESTS+=		varmod-match
+TESTS+=		varmod-match-escape
+TESTS+=		varmod-no-match
+TESTS+=		varmod-order
+TESTS+=		varmod-order-reverse
+TESTS+=		varmod-order-shuffle
+TESTS+=		varmod-path
+TESTS+=		varmod-quote
+TESTS+=		varmod-quote-dollar
+TESTS+=		varmod-range
+TESTS+=		varmod-remember
+TESTS+=		varmod-root
+TESTS+=		varmod-select-words
+TESTS+=		varmod-shell
+TESTS+=		varmod-subst
+TESTS+=		varmod-subst-regex
+TESTS+=		varmod-sysv
+TESTS+=		varmod-tail
+TESTS+=		varmod-to-abs
+TESTS+=		varmod-to-lower
+TESTS+=		varmod-to-many-words
+TESTS+=		varmod-to-one-word
+TESTS+=		varmod-to-separator
+TESTS+=		varmod-to-upper
+TESTS+=		varmod-undefined
+TESTS+=		varmod-unique
+TESTS+=		varname
+TESTS+=		varname-dollar
+TESTS+=		varname-dot-alltargets
+TESTS+=		varname-dot-curdir
+TESTS+=		varname-dot-includes
+TESTS+=		varname-dot-includedfromdir
+TESTS+=		varname-dot-includedfromfile
+TESTS+=		varname-dot-libs
+TESTS+=		varname-dot-make-dependfile
+TESTS+=		varname-dot-make-expand_variables
+TESTS+=		varname-dot-make-exported
+TESTS+=		varname-dot-make-jobs
+TESTS+=		varname-dot-make-jobs-prefix
+TESTS+=		varname-dot-make-level
+TESTS+=		varname-dot-make-makefile_preference
+TESTS+=		varname-dot-make-makefiles
+TESTS+=		varname-dot-make-meta-bailiwick
+TESTS+=		varname-dot-make-meta-created
+TESTS+=		varname-dot-make-meta-files
+TESTS+=		varname-dot-make-meta-ignore_filter
+TESTS+=		varname-dot-make-meta-ignore_paths
+TESTS+=		varname-dot-make-meta-ignore_patterns
+TESTS+=		varname-dot-make-meta-prefix
+TESTS+=		varname-dot-make-mode
+TESTS+=		varname-dot-make-path_filemon
+TESTS+=		varname-dot-make-pid
+TESTS+=		varname-dot-make-ppid
+TESTS+=		varname-dot-make-save_dollars
+TESTS+=		varname-dot-makeoverrides
+TESTS+=		varname-dot-newline
+TESTS+=		varname-dot-objdir
+TESTS+=		varname-dot-parsedir
+TESTS+=		varname-dot-parsefile
+TESTS+=		varname-dot-path
+TESTS+=		varname-dot-shell
+TESTS+=		varname-dot-targets
+TESTS+=		varname-empty
+TESTS+=		varname-make
+TESTS+=		varname-make_print_var_on_error
+TESTS+=		varname-makeflags
+TESTS+=		varname-pwd
+TESTS+=		varname-vpath
+TESTS+=		varparse-dynamic
 TESTS+=		varquote
 TESTS+=		varshell
 
-# Override make flags for certain tests; default is -k.
+# Additional environment variables for some of the tests.
+# The base environment is -i PATH="$PATH".
+ENV.envfirst=		FROM_ENV=value-from-env
+ENV.varmisc=		FROM_ENV=env
+ENV.varmisc+=		FROM_ENV_BEFORE=env
+ENV.varmisc+=		FROM_ENV_AFTER=env
+
+# Override make flags for some of the tests; default is -k.
+# If possible, write ".MAKEFLAGS: -dv" in the test .mk file instead of
+# settings FLAGS.test=-dv here, since that is closer to the test code.
+FLAGS.archive=		-dA
+FLAGS.counter=		-dv
+FLAGS.directive-ifmake=	first second
 FLAGS.doterror=		# none
+FLAGS.envfirst=		-e
+FLAGS.export=		# none
+FLAGS.lint=		-dL -k
+FLAGS.opt-debug-g1=	-dg1
+FLAGS.opt-ignore=	-i
+FLAGS.opt-keep-going=	-k
+FLAGS.opt-no-action=	-n
+FLAGS.opt-query=	-q
+FLAGS.opt-var-expanded=	-v VAR -v VALUE
+FLAGS.opt-var-literal=	-V VAR -V VALUE
+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'
 
 # Some tests need extra post-processing.
-SED_CMDS.modmisc+=	-e 's,\(substitution error:\).*,\1 (details omitted),'
-SED_CMDS.varshell+=	-e 's,^[a-z]*sh: ,,'
+SED_CMDS.opt-debug-g1=	-e 's,${.CURDIR},CURDIR,'
+SED_CMDS.opt-debug-g1+=	-e '/Global Variables:/,/Suffixes:/d'
+SED_CMDS.sh-dots=	-e 's,^.*\.\.\.:.*,<normalized: ...: not found>,'
+SED_CMDS.varmod-subst-regex+= \
+			-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
+SED_CMDS.varmod-edge+=	-e 's, line [0-9]*:, line omitted:,'
+SED_CMDS.varshell+=	-e 's,^${.SHELL:T}: ,,'
 SED_CMDS.varshell+=	-e '/command/s,No such.*,not found,'
+SED_CMDS.varname-dot-shell=	-e 's, = /.*, = (details omitted),'
+SED_CMDS.varname-dot-shell+=	-e 's,"/[^"]*","(details omitted)",'
+SED_CMDS.varname-dot-shell+=	-e 's,\[/[^]]*\],[(details omitted)],'
+
+# Some tests need an additional round of postprocessing.
+POSTPROC.counter=	${TOOL_SED} -n -e '/:RELEVANT = yes/,/:RELEVANT = no/p'
+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-dot-shell= \
+			awk '/\.SHELL/ || /^ParseReadLine/'
+POSTPROC.varname-empty=	${TOOL_SED} -n -e '/^Var_Set/p' -e '/^out:/p'
+
+# Some tests reuse other tests, which makes them unnecessarily fragile.
+export-all.rawout: export.mk
+unexport.rawout: export.mk
+unexport-env.rawout: export.mk
 
 # End of the configuration section.
 
 .MAIN: all
 
+.-include "Makefile.inc"
 .-include "Makefile.config"
 
 UNIT_TESTS:=	${.PARSEDIR}
@@ -96,16 +392,14 @@ OUTFILES=	${TESTS:=.out}
 
 all: ${OUTFILES}
 
-CLEANFILES+=		*.rawout *.out *.status *.tmp *.core *.tmp
+CLEANFILES=		*.rawout *.out *.status *.tmp *.core *.tmp
 CLEANFILES+=		obj*.[och] lib*.a	# posix1.mk
 CLEANFILES+=		issue* .[ab]*		# suffixes.mk
-CLEANRECURSIVE+=	dir dummy		# posix1.mk
+CLEANDIRS=		dir dummy		# posix1.mk
 
 clean:
 	rm -f ${CLEANFILES}
-.if !empty(CLEANRECURSIVE)
-	rm -rf ${CLEANRECURSIVE}
-.endif
+	rm -rf ${CLEANDIRS}
 
 TEST_MAKE?=	${.MAKE}
 TOOL_SED?=	sed
@@ -120,13 +414,24 @@ LANG=		C
 .export LANG LC_ALL
 .endif
 
+.if ${.MAKE.MODE:Unormal:Mmeta} != ""
+# we don't need the noise
+_MKMSG_TEST= :
+.endif
+
 # the tests are actually done with sub-makes.
 .SUFFIXES: .mk .rawout .out
 .mk.rawout:
-	@echo ${TEST_MAKE} ${FLAGS.${.TARGET:R}:U-k} -f ${.IMPSRC}
-	-@cd ${.OBJDIR} && \
-	{ ${TEST_MAKE} ${FLAGS.${.TARGET:R}:U-k} -f ${.IMPSRC} \
-	  2>&1 ; echo $$? >${.TARGET:R}.status ; } > ${.TARGET}.tmp
+	@${_MKMSG_TEST:Uecho '#      test '} ${.PREFIX}
+	@set -eu; \
+	cd ${.OBJDIR}; \
+	env -i PATH="$$PATH" ${ENV.${.TARGET:R}} \
+	  ${TEST_MAKE} \
+	    -r -C ${.CURDIR} -f ${.IMPSRC} \
+	    ${FLAGS.${.TARGET:R}:U-k} \
+	    > ${.TARGET}.tmp 2>&1 \
+	&& status=$$? || status=$$?; \
+	echo $$status > ${.TARGET:R}.status
 	@mv ${.TARGET}.tmp ${.TARGET}
 
 # Post-process the test output so that the results can be compared.
@@ -141,11 +446,12 @@ _SED_CMDS+=	-e 's,${.CURDIR:S,.,\\.,g}/,,g'
 _SED_CMDS+=	-e 's,${UNIT_TESTS:S,.,\\.,g}/,,g'
 
 .rawout.out:
-	@echo postprocess ${.TARGET}
 	@${TOOL_SED} ${_SED_CMDS} ${SED_CMDS.${.TARGET:R}} \
-	  < ${.IMPSRC} > ${.TARGET}.tmp
-	@echo "exit status `cat ${.TARGET:R}.status`" >> ${.TARGET}.tmp
-	@mv ${.TARGET}.tmp ${.TARGET}
+	  < ${.IMPSRC} > ${.TARGET}.tmp1
+	@${POSTPROC.${.TARGET:R}:Ucat} < ${.TARGET}.tmp1 > ${.TARGET}.tmp2
+	@rm ${.TARGET}.tmp1
+	@echo "exit status `cat ${.TARGET:R}.status`" >> ${.TARGET}.tmp2
+	@mv ${.TARGET}.tmp2 ${.TARGET}
 
 # Compare all output files
 test:	${OUTFILES} .PHONY
@@ -168,7 +474,7 @@ accept:
 	done
 
 .if exists(${TEST_MAKE})
-${TESTS:=.rawout}: ${TEST_MAKE}
+${TESTS:=.rawout}: ${TEST_MAKE} ${.PARSEDIR}/Makefile
 .endif
 
 .-include <obj.mk>