 @@ -1,182 +1,185 @@
-# $NetBSD: Makefile,v 1.64 2020/07/25 21:19:29 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2020/07/26 11:10:29 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+=		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+=		varquote
 TESTS+=		varshell
 # Override environment variables for some of the tests.
 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.
 FLAGS.doterror=		# none
 FLAGS.order=		-j1
 FLAGS.envfirst=		-e
 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} \
 	  ${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,141 +1,158 @@
-# $Id: varmisc.mk,v 1.13 2020/07/26 10:59:56 rillig Exp $
+# $Id: varmisc.mk,v 1.14 2020/07/26 11:10:29 rillig Exp $
+#
 # Miscellaneous variable tests.
 all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs NQ_none \
 	strftime cmpv manok
 all: save-dollars
 all: export-appended
 unmatched_var_paren:
 	@echo ${foo::=foo-text}
 True = ${echo true >&2:L:sh}TRUE
 False= ${echo false >&2:L:sh}FALSE
 VSET= is set
 .undef UNDEF
 U_false:
 	@echo :U skipped when var set
 	@echo ${VSET:U${False}}
 D_false:
 	@echo :D skipped if var undef
 	@echo ${UNDEF:D${False}}
 U_true:
 	@echo :U expanded when var undef
 	@echo ${UNDEF:U${True}}
 D_true:
 	@echo :D expanded when var set
 	@echo ${VSET:D${True}}
 Q_lhs:
 	@echo :? only lhs when value true
 	@echo ${1:L:?${True}:${False}}
 Q_rhs:
 	@echo :? only rhs when value false
 	@echo ${0:L:?${True}:${False}}
 NQ_none:
 	@echo do not evaluate or expand :? if discarding
 	@echo ${VSET:U${1:L:?${True}:${False}}}
 April1= 1459494000
 # slightly contorted syntax to use utc via variable
 strftime:
 	@echo ${year=%Y month=%m day=%d:L:gmtime=1459494000}
 	@echo date=${%Y%m%d:L:${gmtime=${April1}:L}}
 # big jumps to handle 3 digits per step
 M_cmpv.units = 1 1000 1000000
 M_cmpv = S,., ,g:_:range:@i@+ $${_:[-$$i]} \* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh
 Version = 123.456.789
 cmpv.only = target specific vars
 cmpv:
 	@echo Version=${Version} == ${Version:${M_cmpv}}
 	@echo Literal=3.4.5 == ${3.4.5:L:${M_cmpv}}
 	@echo We have ${${.TARGET:T}.only}
 # catch misshandling of nested vars in .for loop
 MAN=
 MAN1= make.1
 .for s in 1 2
 .if defined(MAN$s) && !empty(MAN$s)
 MAN+= ${MAN$s}
 .endif
 .endfor
 manok:
 	@echo MAN=${MAN}
 # This is an expanded variant of the above .for loop.
 # Between 2020-06-28 and 2020-07-02 this paragraph generated a wrong
 # error message "Variable VARNAME is recursive".
 # When evaluating the !empty expression, the ${:U1} was not expanded and
 # thus resulted in the seeming definition VARNAME=${VARNAME}, which is
 # obviously recursive.
 VARNAME=	${VARNAME${:U1}}
 .if defined(VARNAME${:U2}) && !empty(VARNAME${:U2})
 .endif
 # begin .MAKE.SAVE_DOLLARS; see Var_Set_with_flags and s2Boolean.
 SD_VALUES=	0 1 2 False True false true Yes No yes no On Off ON OFF on off
 SD_4_DOLLARS=	$$$$
 .for val in ${SD_VALUES}
 .MAKE.SAVE_DOLLARS:=	${val}	# Must be := since a simple = has no effect.
 SD.${val}:=		${SD_4_DOLLARS}
 .endfor
 .MAKE.SAVE_DOLLARS:=	yes
 save-dollars:
 .for val in ${SD_VALUES}
 	@printf '%s: %-8s = %s\n' $@ ${val} ${SD.${val}:Q}
 .endfor
 # Appending to an undefined variable does not add a space in front.
 .undef APPENDED
 APPENDED+=	value
 .if ${APPENDED} != "value"
 .error "${APPENDED}"
 .endif
 # Appending to an empty variable adds a space between the old value
 # and the additional value.
 APPENDED=	# empty
 APPENDED+=	value
 .if ${APPENDED} != " value"
 .error "${APPENDED}"
 .endif
 # Appending to parameterized variables works as well.
 PARAM=		param
 VAR.${PARAM}=	1
 VAR.${PARAM}+=	2
 .if ${VAR.param} != "1 2"
 .error "${VAR.param}"
 .endif
 # The variable name can contain arbitrary characters.
 # If the expanded variable name ends in a +, this still does not influence
 # the parser. The assignment operator is still a simple assignment.
 # Therefore, there is no need to add a space between the variable name
 # and the assignment operator.
 PARAM=		+
 VAR.${PARAM}=	1
 VAR.${PARAM}+=	2
 .if ${VAR.+} != "1 2"
 .error "${VAR.+}"
 .endif
 .for param in + ! ?
 VAR.${param}=	${param}
 .endfor
 .if ${VAR.+} != "+" || ${VAR.!} != "!" || ${VAR.?} != "?"
 .error "${VAR.+}" "${VAR.!}" "${VAR.?}"
 .endif
 # Appending to a variable from the environment creates a copy of that variable
 # in the global context.
 # The appended value is not exported automatically.
 # When a variable is exported, the exported value is taken at the time of the
 # .export directive. Later changes to the variable have no effect.
 .export FROM_ENV_BEFORE
 FROM_ENV+=		mk
 FROM_ENV_BEFORE+=	mk
 FROM_ENV_AFTER+=	mk
 .export FROM_ENV_AFTER
 export-appended:
 	@echo $@: "$$FROM_ENV"
 	@echo $@: "$$FROM_ENV_BEFORE"
 	@echo $@: "$$FROM_ENV_AFTER"

 @@ -1,43 +1,46 @@
 :D expanded when var set
 true
 TRUE
 :U expanded when var undef
 true
 TRUE
 :D skipped if var undef
 :U skipped when var set
 is set
 :? only lhs when value true
 true
 TRUE
 :? only rhs when value false
 false
 FALSE
 do not evaluate or expand :? if discarding
 is set
 year=2016 month=04 day=01
 date=20160401
 Version=123.456.789 == 123456789
 Literal=3.4.5 == 3004005
 We have target specific vars
 MAN= make.1
 save-dollars: 0        = $
 save-dollars: 1        = $$
 save-dollars: 2        = $$
 save-dollars: False    = $
 save-dollars: True     = $$
 save-dollars: false    = $
 save-dollars: true     = $$
 save-dollars: Yes      = $$
 save-dollars: No       = $
 save-dollars: yes      = $$
 save-dollars: no       = $
 save-dollars: On       = $$
 save-dollars: Off      = $
 save-dollars: ON       = $$
 save-dollars: OFF      = $
 save-dollars: on       = $$
 save-dollars: off      = $
 export-appended: env
 export-appended: env
 export-appended: env mk
 exit status 0