 @@ -1,187 +1,188 @@
-# $NetBSD: Makefile,v 1.68 2020/07/27 19:23:12 rillig Exp $
+# $NetBSD: Makefile,v 1.69 2020/07/27 19:45:56 rillig Exp $
+#
 # Unit tests for make(1)
+#
 # The main targets are:
+#
 # all:
 #	run all the tests
 # test:
 #	run 'all', and compare to expected results
 # accept:
 #	move generated output to expected results
+#
 # Settable variables
+#
 # TEST_MAKE
 #	The make program to be tested.
+#
+#
 # Adding a test case
+#
 # Each feature should get its own set of tests in its own suitably
 # 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).
+#
 # Each test is in a sub-makefile.
 # Keep the list sorted.
 TESTS+=		archive
 TESTS+=		comment
 TESTS+=		cond-late
 TESTS+=		cond-short
 TESTS+=		cond1
 TESTS+=		cond2
 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+=		forloop
 TESTS+=		forsubst
 TESTS+=		hash
 TESTS+=		# impsrc	# broken by reverting POSIX changes
 TESTS+=		include-main
 TESTS+=		misc
 TESTS+=		moderrs
 TESTS+=		modmatch
 TESTS+=		modmisc
 TESTS+=		modorder
 TESTS+=		modts
 TESTS+=		modword
 TESTS+=		order
 TESTS+=		# phony-end	# broken by reverting POSIX changes
 TESTS+=		posix
 TESTS+=		# posix1	# broken by reverting POSIX changes
 TESTS+=		qequals
 TESTS+=		# suffixes	# broken by reverting POSIX changes
 TESTS+=		sunshcmd
 TESTS+=		sysv
 TESTS+=		ternary
 TESTS+=		unexport
 TESTS+=		unexport-env
 TESTS+=		varcmd
 TESTS+=		vardebug
 TESTS+=		varfind
 TESTS+=		varmisc
 TESTS+=		varmod-edge
 TESTS+=		varparse-dynamic
 TESTS+=		varquote
 TESTS+=		varshell
 # Override environment variables for some of the tests.
 ENV.envfirst=		FROM_ENV=value-from-env
 ENV.export=		-i PATH=${PATH:Q}
 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.
 FLAGS.doterror=		# none
 FLAGS.envfirst=		-e
 FLAGS.order=		-j1
 FLAGS.vardebug=		-k -dv FROM_CMDLINE=
 # 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.varshell+=	-e '/command/s,No such.*,not found,'
 # Some tests need an additional round of postprocessing.
 POSTPROC.vardebug=	${TOOL_SED} -n -e '/:RELEVANT = yes/,/:RELEVANT = no/p'
 # End of the configuration section.
 .MAIN: all
 UNIT_TESTS:=	${.PARSEDIR}
 .PATH: ${UNIT_TESTS}
 OUTFILES=	${TESTS:=.out}
 all: ${OUTFILES}
 CLEANFILES+=		*.rawout *.out *.status *.tmp *.core *.tmp
 CLEANFILES+=		obj*.[och] lib*.a	# posix1.mk
 CLEANFILES+=		issue* .[ab]*		# suffixes.mk
 CLEANRECURSIVE+=	dir dummy		# posix1.mk
 clean:
 	rm -f ${CLEANFILES}
 .if !empty(CLEANRECURSIVE)
 	rm -rf ${CLEANRECURSIVE}
 .endif
 TEST_MAKE?=	${.MAKE}
 TOOL_SED?=	sed
 # ensure consistent results from sort(1)
 LC_ALL=		C
 LANG=		C
 .export LANG LC_ALL
 # the tests are actually done with sub-makes.
 .SUFFIXES: .mk .rawout .out
 .mk.rawout:
 	@echo testing ${.IMPSRC}
 	@set -eu; \
 	cd ${.OBJDIR}; \
-	${ENV.${.TARGET:R}} ${TEST_MAKE} \
+	env ${ENV.${.TARGET:R}} ${TEST_MAKE} \
 	  ${FLAGS.${.TARGET:R}:U-k} -f ${.IMPSRC} \
 	  > ${.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.
+#
 # always pretend .MAKE was called 'make'
 _SED_CMDS+=	-e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,'
 _SED_CMDS+=	-e 's,${TEST_MAKE:S,.,\\.,g},make,'
 # replace anything after 'stopped in' with unit-tests
 _SED_CMDS+=	-e '/stopped/s, /.*, unit-tests,'
 # strip ${.CURDIR}/ from the output
 _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}.tmp1
 	@${POSTPROC.${.TARGET:R}:U${TOOL_SED}} < ${.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
 	@failed= ; \
 	for test in ${TESTS}; do \
 	  diff -u ${UNIT_TESTS}/$${test}.exp $${test}.out \
 	  || failed="$${failed}$${failed:+ }$${test}" ; \
 	done ; \
 	if [ -n "$${failed}" ]; then \
 	  echo "Failed tests: $${failed}" ; false ; \
 	else \
 	  echo "All tests passed" ; \
 	fi
 accept:
 	@for test in ${TESTS}; do \
 	  cmp -s ${UNIT_TESTS}/$${test}.exp $${test}.out \
 	  || { echo "Replacing $${test}.exp" ; \
 	       cp $${test}.out ${UNIT_TESTS}/$${test}.exp ; } \
 	done
 .if exists(${TEST_MAKE})
 ${TESTS:=.rawout}: ${TEST_MAKE}
 .endif
 .-include <bsd.obj.mk>

 @@ -1,23 +1,24 @@
-# $Id: export-all.mk,v 1.2 2015/04/10 20:41:59 sjg Exp $
+# $Id: export-all.mk,v 1.3 2020/07/27 19:45:56 rillig Exp $
 UT_OK=good
 UT_F=fine
 # the old way to do :tA
 M_tAbad = C,.*,cd & \&\& 'pwd',:sh
 # the new
 M_tA = tA
 here := ${.PARSEDIR}
 # this will cause trouble (recursing if we let it)
 UT_BADDIR = ${${here}/../${here:T}:L:${M_tAbad}:T}
 # this will be ok
 UT_OKDIR = ${${here}/../${here:T}:L:${M_tA}:T}
 .export
 FILTER_CMD=	grep ^UT_
 .include "export.mk"
 UT_TEST=export-all
 UT_ALL=even this gets exported

 @@ -1,6 +1,8 @@
 .MAKE.LEVEL.ENV=MAKELEVEL
 MAKELEVEL=1
 UT_DOLLAR=This is $UT_FU
 UT_FOO=foobar is fubar
 UT_FU=fubar
 UT_TEST=export
 UT_ZOO=hoopie
 exit status 0

 @@ -1,22 +1,23 @@
-# $Id: export.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $Id: export.mk,v 1.2 2020/07/27 19:45:56 rillig Exp $
 UT_TEST=export
 UT_FOO=foo${BAR}
 UT_FU=fubar
 UT_ZOO=hoopie
 UT_NO=all
 # belive it or not, we expect this one to come out with $UT_FU unexpanded.
 UT_DOLLAR= This is $$UT_FU
 .export UT_FU UT_FOO
 .export UT_DOLLAR
 # this one will be ignored
 .export .MAKE.PID
 BAR=bar is ${UT_FU}
 .MAKE.EXPORTED+= UT_ZOO UT_TEST
-all:
+FILTER_CMD?=	grep -v -E '^(MAKEFLAGS|PATH|PWD)='
 	@env | grep '^UT_' | sort
 all:
 	@env | ${FILTER_CMD} | sort

 @@ -1,14 +1,15 @@
-# $Id: unexport-env.mk,v 1.1 2014/08/21 13:44:52 apb Exp $
+# $Id: unexport-env.mk,v 1.2 2020/07/27 19:45:56 rillig Exp $
 # pick up a bunch of exported vars
 FILTER_CMD=	grep ^UT_
 .include "export.mk"
 # an example of setting up a minimal environment.
 PATH = /bin:/usr/bin:/sbin:/usr/sbin
 # now clobber the environment to just PATH and UT_TEST
 UT_TEST = unexport-env
 # this removes everything
 .unexport-env
 .export PATH UT_TEST

 @@ -1,8 +1,9 @@
-# $Id: unexport.mk,v 1.1 2014/08/21 13:44:52 apb Exp $
+# $Id: unexport.mk,v 1.2 2020/07/27 19:45:56 rillig Exp $
 # pick up a bunch of exported vars
 FILTER_CMD=	grep ^UT_
 .include "export.mk"
 .unexport UT_ZOO UT_FOO
 UT_TEST = unexport