Module Name: src Committed By: rillig Date: Thu Jun 1 20:56:35 UTC 2023
Modified Files: src/usr.bin/make/unit-tests: check-expect.lua cmdline-undefined.exp cmdline-undefined.mk cond-cmp-numeric-eq.exp cond-cmp-numeric-eq.mk cond-cmp-unary.exp cond-cmp-unary.mk cond-eof.exp cond-eof.mk cond-func-defined.exp cond-func-defined.mk cond-func-empty.exp cond-func-empty.mk cond-func.exp cond-func.mk cond-op-and-lint.exp cond-op-and-lint.mk cond-op-and.exp cond-op-and.mk cond-op-not.exp cond-op-not.mk cond-op-or-lint.exp cond-op-or-lint.mk cond-op-or.exp cond-op-or.mk cond-op-parentheses.exp cond-op-parentheses.mk cond-op.exp cond-op.mk cond-token-number.exp cond-token-number.mk cond-token-plain.exp cond-token-plain.mk cond-token-string.exp cond-token-string.mk cond-token-var.exp cond-token-var.mk cond-undef-lint.exp cond-undef-lint.mk dep-colon-bug-cross-file.exp dep-colon-bug-cross-file.mk deptgt-begin.exp deptgt-begin.mk deptgt-delete_on_error.mk deptgt.exp deptgt.mk directive-elif.exp directive-elif.mk directive-else.exp directive-else.mk directive-endfor.exp directive-endfor.mk directive-endif.exp directive-endif.mk directive-error.exp directive-error.mk directive-for-break.exp directive-for-break.mk directive-for-empty.exp directive-for-empty.mk directive-for-errors.exp directive-for-errors.mk directive-for-escape.exp directive-for-escape.mk directive-for-generating-endif.exp directive-for-generating-endif.mk directive-for-if.exp directive-for-if.mk directive-for-lines.exp directive-for-lines.mk directive-for.exp directive-for.mk directive-if.exp directive-if.mk directive-ifmake.exp directive-ifmake.mk directive-ifndef.exp directive-ifndef.mk directive-include-fatal.exp directive-include-fatal.mk directive-include.exp directive-include.mk directive-info.exp directive-info.mk directive-misspellings.exp directive-misspellings.mk directive-undef.exp directive-undef.mk directive-unexport-env.exp directive-unexport-env.mk directive-unexport.exp directive-unexport.mk directive-warning.exp directive-warning.mk doterror.mk error.exp error.mk export-env.mk include-main.exp include-main.mk opt-debug-file.exp opt-debug-file.mk opt-debug-hash.exp opt-debug-hash.mk opt-debug-lint.exp opt-debug-lint.mk opt-debug-parse.exp opt-debug-parse.mk opt-warnings-as-errors.exp opt-warnings-as-errors.mk parse.exp parse.mk recursive.exp recursive.mk var-eval-short.exp var-eval-short.mk var-op-assign.exp var-op-assign.mk var-op-expand.exp var-op-expand.mk var-op-shell.exp var-op-shell.mk var-readonly.mk var-recursive.exp var-recursive.mk var-scope-cmdline.exp var-scope-cmdline.mk vardebug.exp vardebug.mk varmod-assign-shell.exp varmod-assign-shell.mk varmod-edge.exp varmod-edge.mk varmod-gmtime.exp varmod-gmtime.mk varmod-ifelse.exp varmod-ifelse.mk varmod-indirect.exp varmod-indirect.mk varmod-localtime.exp varmod-localtime.mk varmod-loop-delete.exp varmod-loop-delete.mk varmod-loop-varname.exp varmod-loop-varname.mk varmod-match-escape.exp varmod-match-escape.mk varmod-order.exp varmod-order.mk varmod-range.exp varmod-range.mk varmod-subst.mk varmod-sysv.exp varmod-sysv.mk varmod-to-abs.exp varmod-to-abs.mk varmod-to-separator.exp varmod-to-separator.mk varmod.exp varmod.mk varname-dollar.exp varname-dollar.mk varname-dot-makeflags.exp varname-dot-makeflags.mk varname-dot-parsedir.exp varname-dot-parsedir.mk varname-dot-parsefile.exp varname-dot-parsefile.mk varname.exp varname.mk varparse-dynamic.exp varparse-dynamic.mk varparse-errors.exp varparse-errors.mk Log Message: tests/make: force line-based diagnostics to be listed in the tests This way, contradictions between the intended output and the actual output are closer together and have a better chance of being spotted. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/check-expect.lua \ src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk \ src/usr.bin/make/unit-tests/cond-func-empty.exp \ src/usr.bin/make/unit-tests/cond-op-parentheses.exp \ src/usr.bin/make/unit-tests/cond-undef-lint.exp \ src/usr.bin/make/unit-tests/directive-else.exp \ src/usr.bin/make/unit-tests/directive-endif.exp \ src/usr.bin/make/unit-tests/directive-error.mk \ src/usr.bin/make/unit-tests/directive-for-errors.mk \ src/usr.bin/make/unit-tests/directive-warning.exp \ src/usr.bin/make/unit-tests/opt-warnings-as-errors.mk \ src/usr.bin/make/unit-tests/recursive.mk \ src/usr.bin/make/unit-tests/var-op-assign.exp \ src/usr.bin/make/unit-tests/var-op-shell.exp \ src/usr.bin/make/unit-tests/var-recursive.exp \ src/usr.bin/make/unit-tests/varmod-loop-varname.exp \ src/usr.bin/make/unit-tests/varmod-to-abs.mk \ src/usr.bin/make/unit-tests/varname-dot-parsefile.mk cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cmdline-undefined.exp \ src/usr.bin/make/unit-tests/cmdline-undefined.mk \ src/usr.bin/make/unit-tests/dep-colon-bug-cross-file.exp \ src/usr.bin/make/unit-tests/directive-for-empty.exp \ src/usr.bin/make/unit-tests/directive-for-generating-endif.exp \ src/usr.bin/make/unit-tests/directive-for-if.exp \ src/usr.bin/make/unit-tests/directive-include-fatal.exp \ src/usr.bin/make/unit-tests/directive-misspellings.exp \ src/usr.bin/make/unit-tests/doterror.mk \ src/usr.bin/make/unit-tests/var-scope-cmdline.exp \ src/usr.bin/make/unit-tests/var-scope-cmdline.mk \ src/usr.bin/make/unit-tests/varmod-loop-delete.exp \ src/usr.bin/make/unit-tests/varmod-loop-delete.mk \ src/usr.bin/make/unit-tests/varname-dollar.exp \ src/usr.bin/make/unit-tests/varparse-dynamic.exp cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.exp \ src/usr.bin/make/unit-tests/cond-cmp-unary.mk \ src/usr.bin/make/unit-tests/cond-eof.exp \ src/usr.bin/make/unit-tests/cond-eof.mk \ src/usr.bin/make/unit-tests/cond-op-not.exp \ src/usr.bin/make/unit-tests/cond-op-or.exp \ src/usr.bin/make/unit-tests/dep-colon-bug-cross-file.mk \ src/usr.bin/make/unit-tests/directive-for-break.mk \ src/usr.bin/make/unit-tests/directive-for-errors.exp \ src/usr.bin/make/unit-tests/directive-for-lines.mk \ src/usr.bin/make/unit-tests/directive-ifndef.exp \ src/usr.bin/make/unit-tests/export-env.mk \ src/usr.bin/make/unit-tests/opt-debug-hash.exp \ src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp \ src/usr.bin/make/unit-tests/parse.mk \ src/usr.bin/make/unit-tests/var-recursive.mk \ src/usr.bin/make/unit-tests/varmod-assign-shell.exp \ src/usr.bin/make/unit-tests/varmod-assign-shell.mk \ src/usr.bin/make/unit-tests/varmod-loop-varname.mk \ src/usr.bin/make/unit-tests/varmod-to-abs.exp \ src/usr.bin/make/unit-tests/varname-dot-parsedir.exp cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cond-cmp-unary.exp \ src/usr.bin/make/unit-tests/cond-op-and.exp \ src/usr.bin/make/unit-tests/cond-token-var.exp \ src/usr.bin/make/unit-tests/cond-undef-lint.mk \ src/usr.bin/make/unit-tests/deptgt-begin.exp \ src/usr.bin/make/unit-tests/deptgt-delete_on_error.mk \ src/usr.bin/make/unit-tests/directive-error.exp \ src/usr.bin/make/unit-tests/directive-for-break.exp \ src/usr.bin/make/unit-tests/directive-for-lines.exp \ src/usr.bin/make/unit-tests/directive-include-fatal.mk \ src/usr.bin/make/unit-tests/directive-misspellings.mk \ src/usr.bin/make/unit-tests/error.exp \ src/usr.bin/make/unit-tests/error.mk \ src/usr.bin/make/unit-tests/opt-debug-hash.mk \ src/usr.bin/make/unit-tests/parse.exp \ src/usr.bin/make/unit-tests/recursive.exp \ src/usr.bin/make/unit-tests/varname-dollar.mk \ src/usr.bin/make/unit-tests/varname-dot-parsefile.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-func-defined.exp \ src/usr.bin/make/unit-tests/cond-op-and.mk \ src/usr.bin/make/unit-tests/cond-op-parentheses.mk \ src/usr.bin/make/unit-tests/cond-token-number.exp \ src/usr.bin/make/unit-tests/cond-token-var.mk \ src/usr.bin/make/unit-tests/deptgt-begin.mk \ src/usr.bin/make/unit-tests/directive-elif.exp \ src/usr.bin/make/unit-tests/directive-endif.mk \ src/usr.bin/make/unit-tests/directive-ifmake.exp \ src/usr.bin/make/unit-tests/directive-ifndef.mk \ src/usr.bin/make/unit-tests/directive-unexport.exp \ src/usr.bin/make/unit-tests/opt-debug-file.exp \ src/usr.bin/make/unit-tests/var-op-shell.mk \ src/usr.bin/make/unit-tests/varmod.exp \ src/usr.bin/make/unit-tests/varname-dot-makeflags.exp \ src/usr.bin/make/unit-tests/varname-dot-parsedir.mk \ src/usr.bin/make/unit-tests/varparse-dynamic.mk cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/cond-func-defined.mk \ src/usr.bin/make/unit-tests/cond-token-string.exp \ src/usr.bin/make/unit-tests/directive-include.exp \ src/usr.bin/make/unit-tests/opt-debug-parse.exp \ src/usr.bin/make/unit-tests/var-eval-short.mk \ src/usr.bin/make/unit-tests/varmod-range.exp \ src/usr.bin/make/unit-tests/varmod-sysv.exp cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/cond-func-empty.mk \ src/usr.bin/make/unit-tests/directive-for-escape.mk cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-func.exp \ src/usr.bin/make/unit-tests/cond-op-or.mk \ src/usr.bin/make/unit-tests/cond-token-number.mk \ src/usr.bin/make/unit-tests/directive-undef.exp \ src/usr.bin/make/unit-tests/directive-unexport-env.mk \ src/usr.bin/make/unit-tests/include-main.mk \ src/usr.bin/make/unit-tests/opt-debug-file.mk \ src/usr.bin/make/unit-tests/var-op-assign.mk \ src/usr.bin/make/unit-tests/varparse-errors.exp \ src/usr.bin/make/unit-tests/varparse-errors.mk cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/cond-func.mk \ src/usr.bin/make/unit-tests/directive-undef.mk \ src/usr.bin/make/unit-tests/directive-unexport-env.exp \ src/usr.bin/make/unit-tests/include-main.exp \ src/usr.bin/make/unit-tests/varmod-localtime.exp \ src/usr.bin/make/unit-tests/varmod-localtime.mk cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cond-op-and-lint.exp \ src/usr.bin/make/unit-tests/cond-op-and-lint.mk \ src/usr.bin/make/unit-tests/cond-op-or-lint.exp \ src/usr.bin/make/unit-tests/cond-op-or-lint.mk \ src/usr.bin/make/unit-tests/directive-endfor.exp \ src/usr.bin/make/unit-tests/directive-endfor.mk \ src/usr.bin/make/unit-tests/directive-for-empty.mk \ src/usr.bin/make/unit-tests/directive-for-generating-endif.mk \ src/usr.bin/make/unit-tests/directive-for-if.mk \ src/usr.bin/make/unit-tests/var-readonly.mk cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-op-not.mk \ src/usr.bin/make/unit-tests/cond-token-string.mk \ src/usr.bin/make/unit-tests/directive-elif.mk \ src/usr.bin/make/unit-tests/directive-else.mk \ src/usr.bin/make/unit-tests/directive-info.exp \ src/usr.bin/make/unit-tests/directive-unexport.mk \ src/usr.bin/make/unit-tests/directive-warning.mk \ src/usr.bin/make/unit-tests/opt-debug-parse.mk \ src/usr.bin/make/unit-tests/var-op-expand.exp \ src/usr.bin/make/unit-tests/vardebug.mk \ src/usr.bin/make/unit-tests/varmod-match-escape.mk \ src/usr.bin/make/unit-tests/varmod-order.exp \ src/usr.bin/make/unit-tests/varmod-range.mk \ src/usr.bin/make/unit-tests/varmod.mk \ src/usr.bin/make/unit-tests/varname-dot-makeflags.mk cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-op.exp \ src/usr.bin/make/unit-tests/deptgt.exp \ src/usr.bin/make/unit-tests/directive-if.mk \ src/usr.bin/make/unit-tests/directive-include.mk \ src/usr.bin/make/unit-tests/varmod-indirect.mk \ src/usr.bin/make/unit-tests/varmod-to-separator.mk cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/cond-op.mk \ src/usr.bin/make/unit-tests/varmod-gmtime.exp \ src/usr.bin/make/unit-tests/varmod-ifelse.exp cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/cond-token-plain.exp \ src/usr.bin/make/unit-tests/directive-for.exp cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/cond-token-plain.mk \ src/usr.bin/make/unit-tests/opt-debug-lint.exp \ src/usr.bin/make/unit-tests/var-op-expand.mk \ src/usr.bin/make/unit-tests/varname.exp cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/deptgt.mk cvs rdiff -u -r1.20 -r1.21 \ src/usr.bin/make/unit-tests/directive-for-escape.exp cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/directive-for.mk \ src/usr.bin/make/unit-tests/varmod-ifelse.mk cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/directive-if.exp \ src/usr.bin/make/unit-tests/directive-ifmake.mk \ src/usr.bin/make/unit-tests/directive-info.mk \ src/usr.bin/make/unit-tests/varmod-order.mk \ src/usr.bin/make/unit-tests/varmod-subst.mk \ src/usr.bin/make/unit-tests/varmod-to-separator.exp \ src/usr.bin/make/unit-tests/varname.mk cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/opt-debug-lint.mk \ src/usr.bin/make/unit-tests/varmod-edge.exp \ src/usr.bin/make/unit-tests/varmod-gmtime.mk \ src/usr.bin/make/unit-tests/varmod-sysv.mk cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/var-eval-short.exp \ src/usr.bin/make/unit-tests/varmod-indirect.exp cvs rdiff -u -r1.29 -r1.30 src/usr.bin/make/unit-tests/vardebug.exp cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varmod-edge.mk \ src/usr.bin/make/unit-tests/varmod-match-escape.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.