Module Name: src Committed By: rillig Date: Thu Jul 4 20:18:40 UTC 2024
Modified Files: src/usr.bin/make: main.c src/usr.bin/make/unit-tests: Makefile compat-error.exp cond-cmp-numeric.exp cond-func-defined.exp cond-late.exp cond-op-not.exp cond-op-parentheses.exp cond-op.exp cond-short.exp cond-token-number.exp cond-token-string.exp dep-percent.exp dep.exp depsrc-ignore.exp deptgt-begin-fail-indirect.exp deptgt-begin-fail.exp deptgt-delete_on_error.exp deptgt-end-fail-all.exp deptgt-end-fail-indirect.exp deptgt-end-fail.exp deptgt-error.exp deptgt-ignore.exp deptgt-path-suffix.exp deptgt.exp directive-dinclude.exp directive-elif.exp directive-else.exp directive-for-generating-endif.exp directive-for-if.exp directive-for-null.exp directive-hyphen-include.exp directive-ifmake.exp directive-include-fatal.exp directive-include.exp directive-info.exp directive-sinclude.exp directive-undef.exp directive-unexport-env.exp directive-warning.exp directive.exp doterror.exp jobs-empty-commands-error.exp jobs-error-indirect.exp jobs-error-nested-make.exp jobs-error-nested.exp opt-debug-errors-jobs.exp opt-debug-errors.exp opt-debug-graph2.exp opt-debug-graph3.exp opt-file.exp opt-keep-going-indirect.exp opt-keep-going-multiple.exp opt-keep-going.exp opt-warnings-as-errors.exp opt.exp parse.exp posix.exp sh-jobs.exp suff-add-later.exp suff-clear-regular.exp suff-clear-single.exp suff-main-several.exp suff-self.exp suff-transform-endless.exp suff-transform-expand.exp suff-transform-select.exp suff-use.exp use-inference.exp var-eval-short.exp var-op-assign.exp var-op-expand.exp var-recursive.exp varmod-edge.exp varmod-gmtime.exp varmod-localtime.exp varmod-loop-delete.exp varmod-loop-varname.exp varmod-match-escape.exp varmod-order.exp varmod-range.exp varmod-sysv.exp varname-dot-newline.exp varname-make_print_var_on_error-jobs.exp varname-make_print_var_on_error.exp varname.exp Log Message: make: on error, print the targets to be made This helps to understand situations with several nested sub-makes in varying directories. To generate a diff of this commit: cvs rdiff -u -r1.625 -r1.626 src/usr.bin/make/main.c cvs rdiff -u -r1.348 -r1.349 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/compat-error.exp \ src/usr.bin/make/unit-tests/depsrc-ignore.exp \ src/usr.bin/make/unit-tests/directive-include-fatal.exp \ src/usr.bin/make/unit-tests/opt-debug-errors.exp \ src/usr.bin/make/unit-tests/varname-make_print_var_on_error.exp cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/cond-cmp-numeric.exp \ src/usr.bin/make/unit-tests/cond-func-defined.exp \ src/usr.bin/make/unit-tests/directive.exp \ src/usr.bin/make/unit-tests/opt-file.exp cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-late.exp \ src/usr.bin/make/unit-tests/cond-token-number.exp \ src/usr.bin/make/unit-tests/directive-elif.exp \ src/usr.bin/make/unit-tests/directive-ifmake.exp \ src/usr.bin/make/unit-tests/var-op-assign.exp cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cond-op-not.exp \ src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp \ src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp \ src/usr.bin/make/unit-tests/varmod-loop-delete.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-op-parentheses.exp \ src/usr.bin/make/unit-tests/deptgt-end-fail.exp \ src/usr.bin/make/unit-tests/directive-else.exp \ src/usr.bin/make/unit-tests/directive-warning.exp \ src/usr.bin/make/unit-tests/parse.exp \ src/usr.bin/make/unit-tests/varname-dot-newline.exp cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/cond-op.exp \ 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/suff-main-several.exp cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/cond-short.exp \ src/usr.bin/make/unit-tests/deptgt.exp \ src/usr.bin/make/unit-tests/directive-unexport-env.exp \ src/usr.bin/make/unit-tests/varmod-range.exp \ src/usr.bin/make/unit-tests/varmod-sysv.exp cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/dep-percent.exp \ src/usr.bin/make/unit-tests/dep.exp \ src/usr.bin/make/unit-tests/deptgt-begin-fail-indirect.exp \ src/usr.bin/make/unit-tests/deptgt-end-fail-all.exp \ src/usr.bin/make/unit-tests/deptgt-end-fail-indirect.exp \ src/usr.bin/make/unit-tests/deptgt-error.exp \ src/usr.bin/make/unit-tests/deptgt-ignore.exp \ src/usr.bin/make/unit-tests/deptgt-path-suffix.exp \ src/usr.bin/make/unit-tests/doterror.exp \ src/usr.bin/make/unit-tests/jobs-empty-commands-error.exp \ src/usr.bin/make/unit-tests/jobs-error-indirect.exp \ src/usr.bin/make/unit-tests/jobs-error-nested.exp \ src/usr.bin/make/unit-tests/opt-keep-going-multiple.exp \ src/usr.bin/make/unit-tests/posix.exp \ src/usr.bin/make/unit-tests/sh-jobs.exp \ src/usr.bin/make/unit-tests/suff-clear-regular.exp \ src/usr.bin/make/unit-tests/suff-clear-single.exp \ src/usr.bin/make/unit-tests/suff-self.exp \ src/usr.bin/make/unit-tests/suff-transform-expand.exp \ src/usr.bin/make/unit-tests/use-inference.exp \ src/usr.bin/make/unit-tests/varname-make_print_var_on_error-jobs.exp cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/deptgt-begin-fail.exp \ src/usr.bin/make/unit-tests/opt-keep-going-indirect.exp \ src/usr.bin/make/unit-tests/suff-use.exp cvs rdiff -u -r1.4 -r1.5 \ src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp \ src/usr.bin/make/unit-tests/directive-dinclude.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-for-null.exp \ src/usr.bin/make/unit-tests/directive-hyphen-include.exp \ src/usr.bin/make/unit-tests/directive-sinclude.exp \ src/usr.bin/make/unit-tests/jobs-error-nested-make.exp \ src/usr.bin/make/unit-tests/opt-keep-going.exp \ src/usr.bin/make/unit-tests/suff-add-later.exp \ src/usr.bin/make/unit-tests/suff-transform-endless.exp \ src/usr.bin/make/unit-tests/suff-transform-select.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/directive-info.exp \ src/usr.bin/make/unit-tests/opt-debug-graph2.exp \ src/usr.bin/make/unit-tests/opt-debug-graph3.exp \ src/usr.bin/make/unit-tests/opt.exp \ src/usr.bin/make/unit-tests/var-recursive.exp \ src/usr.bin/make/unit-tests/varmod-loop-varname.exp cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/directive-undef.exp cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/unit-tests/var-eval-short.exp cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/var-op-expand.exp \ src/usr.bin/make/unit-tests/varmod-order.exp cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varmod-edge.exp cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/varmod-gmtime.exp cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-localtime.exp cvs rdiff -u -r1.21 -r1.22 \ src/usr.bin/make/unit-tests/varmod-match-escape.exp cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/varname.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.625 src/usr.bin/make/main.c:1.626 --- src/usr.bin/make/main.c:1.625 Sun Jun 30 11:37:21 2024 +++ src/usr.bin/make/main.c Thu Jul 4 20:18:40 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.625 2024/06/30 11:37:21 rillig Exp $ */ +/* $NetBSD: main.c,v 1.626 2024/07/04 20:18:40 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -111,7 +111,7 @@ #include "trace.h" /* "@(#)main.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: main.c,v 1.625 2024/06/30 11:37:21 rillig Exp $"); +MAKE_RCSID("$NetBSD: main.c,v 1.626 2024/07/04 20:18:40 rillig Exp $"); #if defined(MAKE_NATIVE) __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 " "The Regents of the University of California. " @@ -2067,6 +2067,7 @@ void PrintOnError(GNode *gn, const char *msg) { static GNode *errorNode = NULL; + StringListNode *ln; if (DEBUG(HASH)) { Targ_Stats(); @@ -2076,7 +2077,20 @@ PrintOnError(GNode *gn, const char *msg) if (errorNode != NULL) return; /* we've been here! */ - printf("%s%s: stopped in %s\n", msg, progname, curdir); + printf("%s%s: stopped", msg, progname); + ln = opts.create.first; + if (ln != NULL || mainNode != NULL) { + printf(" making \""); + if (ln != NULL) { + printf("%s", (const char *)ln->datum); + for (ln = ln->next; ln != NULL; ln = ln->next) + printf(" %s", (const char *)ln->datum); + } + if (opts.create.first == NULL && mainNode != NULL) + printf("%s", mainNode->name); + printf("\""); + } + printf(" in %s\n", curdir); /* we generally want to keep quiet if a sub-make died */ if (shouldDieQuietly(gn, -1)) Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.348 src/usr.bin/make/unit-tests/Makefile:1.349 --- src/usr.bin/make/unit-tests/Makefile:1.348 Mon Jul 1 21:02:26 2024 +++ src/usr.bin/make/unit-tests/Makefile Thu Jul 4 20:18:40 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.348 2024/07/01 21:02:26 sjg Exp $ +# $NetBSD: Makefile,v 1.349 2024/07/04 20:18:40 rillig Exp $ # # Unit tests for make(1) # @@ -733,7 +733,7 @@ LIMIT_RESOURCES?= : # Postprocess the test output to make the output platform-independent. # # Replace anything after 'stopped in' with unit-tests -_SED_CMDS+= -e '/stopped/s, /.*, unit-tests,' +_SED_CMDS+= -e '/stopped/s, in /.*, in unit-tests,' # Allow the test files to be placed anywhere. _SED_CMDS+= -e 's,\(\.PARSEDIR}\) = `'"/[^']*'"',\1 = <some-dir>,' _SED_CMDS+= -e 's,\(\.INCLUDEDFROMDIR}\) = `'"/[^']*'"',\1 = <some-dir>,' Index: src/usr.bin/make/unit-tests/compat-error.exp diff -u src/usr.bin/make/unit-tests/compat-error.exp:1.3 src/usr.bin/make/unit-tests/compat-error.exp:1.4 --- src/usr.bin/make/unit-tests/compat-error.exp:1.3 Sun Dec 13 19:33:53 2020 +++ src/usr.bin/make/unit-tests/compat-error.exp Thu Jul 4 20:18:40 2024 @@ -9,7 +9,7 @@ false 'fail2' '${.TARGET}' '$${.TARGET}' : Making success3 out of nothing. Stop. -make: stopped in unit-tests +make: stopped making "success1 fail1 success2 fail2 success3" in unit-tests .ERROR target: <fail1> .ERROR command: <> exit status 1 Index: src/usr.bin/make/unit-tests/depsrc-ignore.exp diff -u src/usr.bin/make/unit-tests/depsrc-ignore.exp:1.3 src/usr.bin/make/unit-tests/depsrc-ignore.exp:1.4 --- src/usr.bin/make/unit-tests/depsrc-ignore.exp:1.3 Tue Dec 26 17:12:33 2023 +++ src/usr.bin/make/unit-tests/depsrc-ignore.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ false all *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-include-fatal.exp diff -u src/usr.bin/make/unit-tests/directive-include-fatal.exp:1.3 src/usr.bin/make/unit-tests/directive-include-fatal.exp:1.4 --- src/usr.bin/make/unit-tests/directive-include-fatal.exp:1.3 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-include-fatal.exp Thu Jul 4 20:18:40 2024 @@ -1,4 +1,4 @@ make: "directive-include-fatal.mk" line 14: Malformed conditional (${UNDEF}) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-debug-errors.exp diff -u src/usr.bin/make/unit-tests/opt-debug-errors.exp:1.3 src/usr.bin/make/unit-tests/opt-debug-errors.exp:1.4 --- src/usr.bin/make/unit-tests/opt-debug-errors.exp:1.3 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/opt-debug-errors.exp Thu Jul 4 20:18:40 2024 @@ -33,5 +33,5 @@ word1 word2 `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varname-make_print_var_on_error.exp diff -u src/usr.bin/make/unit-tests/varname-make_print_var_on_error.exp:1.3 src/usr.bin/make/unit-tests/varname-make_print_var_on_error.exp:1.4 --- src/usr.bin/make/unit-tests/varname-make_print_var_on_error.exp:1.3 Sun Dec 13 19:08:20 2020 +++ src/usr.bin/make/unit-tests/varname-make_print_var_on_error.exp Thu Jul 4 20:18:40 2024 @@ -3,7 +3,7 @@ fail all *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests .ERROR_TARGET='all' .ERROR_CMD='' exit status 1 Index: src/usr.bin/make/unit-tests/cond-cmp-numeric.exp diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric.exp:1.9 src/usr.bin/make/unit-tests/cond-cmp-numeric.exp:1.10 --- src/usr.bin/make/unit-tests/cond-cmp-numeric.exp:1.9 Sat Mar 4 08:07:29 2023 +++ src/usr.bin/make/unit-tests/cond-cmp-numeric.exp Thu Jul 4 20:18:40 2024 @@ -11,5 +11,5 @@ Comparing 123.000000 < 124.000000 CondParser_Eval: ${:U123 } < 124 make: "cond-cmp-numeric.mk" line 54: Comparison with '<' requires both operands '123 ' and '124' to be numeric make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/cond-func-defined.exp diff -u src/usr.bin/make/unit-tests/cond-func-defined.exp:1.9 src/usr.bin/make/unit-tests/cond-func-defined.exp:1.10 --- src/usr.bin/make/unit-tests/cond-func-defined.exp:1.9 Tue Apr 23 22:51:28 2024 +++ src/usr.bin/make/unit-tests/cond-func-defined.exp Thu Jul 4 20:18:40 2024 @@ -1,5 +1,5 @@ make: "cond-func-defined.mk" line 24: Missing closing parenthesis for defined() make: "cond-func-defined.mk" line 34: Missing closing parenthesis for defined() make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive.exp diff -u src/usr.bin/make/unit-tests/directive.exp:1.9 src/usr.bin/make/unit-tests/directive.exp:1.10 --- src/usr.bin/make/unit-tests/directive.exp:1.9 Sat Aug 19 11:09:02 2023 +++ src/usr.bin/make/unit-tests/directive.exp Thu Jul 4 20:18:40 2024 @@ -10,5 +10,5 @@ Global: .MAKEFLAGS = -r -k -d v -d 0 make: "directive.mk" line 40: Invalid line 'target-without-colon' make: "directive.mk" line 43: Invalid line 'target-without-colon another-target' make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making ".target" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-file.exp diff -u src/usr.bin/make/unit-tests/opt-file.exp:1.9 src/usr.bin/make/unit-tests/opt-file.exp:1.10 --- src/usr.bin/make/unit-tests/opt-file.exp:1.9 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/opt-file.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ make: "(stdin)" line 1: Zero byte read f `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/cond-late.exp diff -u src/usr.bin/make/unit-tests/cond-late.exp:1.7 src/usr.bin/make/unit-tests/cond-late.exp:1.8 --- src/usr.bin/make/unit-tests/cond-late.exp:1.7 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/cond-late.exp Thu Jul 4 20:18:40 2024 @@ -1,7 +1,7 @@ make: "cond-late.mk" line 38: while evaluating variable "VAR" with value "${${UNDEF} != "no":?:}": while evaluating condition " != "no"": Bad condition in directory <curdir> make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "do-parse-time" in unit-tests yes no exit status 0 Index: src/usr.bin/make/unit-tests/cond-token-number.exp diff -u src/usr.bin/make/unit-tests/cond-token-number.exp:1.7 src/usr.bin/make/unit-tests/cond-token-number.exp:1.8 --- src/usr.bin/make/unit-tests/cond-token-number.exp:1.7 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/cond-token-number.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: "cond-token-number.mk" line 27: Ma make: "cond-token-number.mk" line 38: Malformed conditional (!-1) make: "cond-token-number.mk" line 49: Malformed conditional (!+1) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-elif.exp diff -u src/usr.bin/make/unit-tests/directive-elif.exp:1.7 src/usr.bin/make/unit-tests/directive-elif.exp:1.8 --- src/usr.bin/make/unit-tests/directive-elif.exp:1.7 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-elif.exp Thu Jul 4 20:18:40 2024 @@ -17,5 +17,5 @@ make: "directive-elif.mk" line 143: 2-el make: "directive-elif.mk" line 149: if-less elif make: "directive-elif.mk" line 154: warning: extra elif make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-ifmake.exp diff -u src/usr.bin/make/unit-tests/directive-ifmake.exp:1.7 src/usr.bin/make/unit-tests/directive-ifmake.exp:1.8 --- src/usr.bin/make/unit-tests/directive-ifmake.exp:1.7 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-ifmake.exp Thu Jul 4 20:18:40 2024 @@ -11,5 +11,5 @@ make: "directive-ifmake.mk" line 82: ok make: don't know how to make !edge (continuing) Stop. -make: stopped in unit-tests +make: stopped making "first second late-target !edge" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/var-op-assign.exp diff -u src/usr.bin/make/unit-tests/var-op-assign.exp:1.7 src/usr.bin/make/unit-tests/var-op-assign.exp:1.8 --- src/usr.bin/make/unit-tests/var-op-assign.exp:1.7 Sat Aug 19 10:52:14 2023 +++ src/usr.bin/make/unit-tests/var-op-assign.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ this will be evaluated later make: "var-op-assign.mk" line 60: Invalid line 'VARIABLE NAME= variable value' make: "var-op-assign.mk" line 95: Parsing still continues until here. make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/cond-op-not.exp diff -u src/usr.bin/make/unit-tests/cond-op-not.exp:1.5 src/usr.bin/make/unit-tests/cond-op-not.exp:1.6 --- src/usr.bin/make/unit-tests/cond-op-not.exp:1.5 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/cond-op-not.exp Thu Jul 4 20:18:40 2024 @@ -5,5 +5,5 @@ make: "cond-op-not.mk" line 53: Not 1 ev make: "cond-op-not.mk" line 60: Not word evaluates to false. make: "cond-op-not.mk" line 65: Malformed conditional (!) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp diff -u src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.5 src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.6 --- src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.5 Fri Apr 26 17:11:22 2024 +++ src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Thu Jul 4 20:18:40 2024 @@ -7,7 +7,7 @@ echo '3 spaces'; false echo '3 spaces'; false *** [fail-spaces] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests echo \ indented; false indented @@ -17,7 +17,7 @@ echo \ indented; false echo \ indented; false *** [fail-escaped-space] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests echo 'line1 line2'; false line1 @@ -31,7 +31,7 @@ line2 line2'; false *** [fail-newline] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests echo 'line1 line2'; false line1 line2 @@ -41,7 +41,7 @@ line1 line2 echo 'line1 line2'; false *** [fail-multiline] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests echo 'word1' 'word2'; false word1 word2 @@ -51,7 +51,7 @@ word1 word2 echo 'word1' 'word2'; false *** [fail-multiline-intention] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests *** Failed target: fail-vars *** In directory: <curdir> @@ -60,5 +60,5 @@ make: stopped in unit-tests => @false c-compiler flag1 -macro="several words" *** [fail-vars] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp diff -u src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp:1.5 src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp:1.6 --- src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp:1.5 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/opt-warnings-as-errors.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: parsing warnings being treated as make: "opt-warnings-as-errors.mk" line 15: warning: message 2 parsing continues make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-loop-delete.exp diff -u src/usr.bin/make/unit-tests/varmod-loop-delete.exp:1.5 src/usr.bin/make/unit-tests/varmod-loop-delete.exp:1.6 --- src/usr.bin/make/unit-tests/varmod-loop-delete.exp:1.5 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-loop-delete.exp Thu Jul 4 20:18:40 2024 @@ -1,4 +1,4 @@ make: "varmod-loop-delete.mk" line 20: while evaluating variable "VAR" with value "${:U:@VAR@@} rest of the value": while evaluating "${:U:@VAR@@} rest of the value": Cannot delete variable "VAR" while it is used make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/cond-op-parentheses.exp diff -u src/usr.bin/make/unit-tests/cond-op-parentheses.exp:1.6 src/usr.bin/make/unit-tests/cond-op-parentheses.exp:1.7 --- src/usr.bin/make/unit-tests/cond-op-parentheses.exp:1.6 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/cond-op-parentheses.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: "cond-op-parentheses.mk" line 25: make: "cond-op-parentheses.mk" line 44: Malformed conditional (() make: "cond-op-parentheses.mk" line 58: Malformed conditional ()) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-end-fail.exp diff -u src/usr.bin/make/unit-tests/deptgt-end-fail.exp:1.6 src/usr.bin/make/unit-tests/deptgt-end-fail.exp:1.7 --- src/usr.bin/make/unit-tests/deptgt-end-fail.exp:1.6 Mon Dec 7 01:04:07 2020 +++ src/usr.bin/make/unit-tests/deptgt-end-fail.exp Thu Jul 4 20:18:40 2024 @@ -13,7 +13,7 @@ Test case all=ok all-dep=ok end=ok end-d *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -25,7 +25,7 @@ Test case all=ok all-dep=ok end=ERR end- *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -36,7 +36,7 @@ Test case all=ok all-dep=ok end=ERR end- *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -46,7 +46,7 @@ Test case all=ok all-dep=ERR end=ok end- `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -56,7 +56,7 @@ Test case all=ok all-dep=ERR end=ok end- `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -66,7 +66,7 @@ Test case all=ok all-dep=ERR end=ERR end `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -76,7 +76,7 @@ Test case all=ok all-dep=ERR end=ERR end `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -86,7 +86,7 @@ Test case all=ERR all-dep=ok end=ok end- *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -96,7 +96,7 @@ Test case all=ERR all-dep=ok end=ok end- *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -106,7 +106,7 @@ Test case all=ERR all-dep=ok end=ERR end *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -116,7 +116,7 @@ Test case all=ERR all-dep=ok end=ERR end *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -126,7 +126,7 @@ Test case all=ERR all-dep=ERR end=ok end `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -136,7 +136,7 @@ Test case all=ERR all-dep=ERR end=ok end `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -146,7 +146,7 @@ Test case all=ERR all-dep=ERR end=ERR en `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 @@ -156,7 +156,7 @@ Test case all=ERR all-dep=ERR end=ERR en `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-else.exp diff -u src/usr.bin/make/unit-tests/directive-else.exp:1.6 src/usr.bin/make/unit-tests/directive-else.exp:1.7 --- src/usr.bin/make/unit-tests/directive-else.exp:1.6 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-else.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ make: "directive-else.mk" line 36: ok make: "directive-else.mk" line 38: warning: extra else make: "directive-else.mk" line 51: The .else directive does not take arguments make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-warning.exp diff -u src/usr.bin/make/unit-tests/directive-warning.exp:1.6 src/usr.bin/make/unit-tests/directive-warning.exp:1.7 --- src/usr.bin/make/unit-tests/directive-warning.exp:1.6 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-warning.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ make: "directive-warning.mk" line 19: wa make: "directive-warning.mk" line 21: Unknown directive "warnings" make: "directive-warning.mk" line 23: Unknown directive "warnings" make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/parse.exp diff -u src/usr.bin/make/unit-tests/parse.exp:1.6 src/usr.bin/make/unit-tests/parse.exp:1.7 --- src/usr.bin/make/unit-tests/parse.exp:1.6 Sat Aug 19 11:09:02 2023 +++ src/usr.bin/make/unit-tests/parse.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ make: "parse.mk" line 7: Invalid line '< make: "parse.mk" line 14: Invalid line '>>>>>> new' make: "parse.mk" line 25: Invalid line 'one-target ${:U }', expanded to 'one-target ' make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "Try_to_crash_FreeBSD.xxxxxxxxxxxxxxxxxx" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varname-dot-newline.exp diff -u src/usr.bin/make/unit-tests/varname-dot-newline.exp:1.6 src/usr.bin/make/unit-tests/varname-dot-newline.exp:1.7 --- src/usr.bin/make/unit-tests/varname-dot-newline.exp:1.6 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varname-dot-newline.exp Thu Jul 4 20:18:40 2024 @@ -5,7 +5,7 @@ make: "varname-dot-newline.mk" line 30: make: "varname-dot-newline.mk" line 32: Cannot delete ".newline" as it is read-only in directory <curdir> make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "try-to-modify" in unit-tests first second backslash newline: <\ Index: src/usr.bin/make/unit-tests/cond-op.exp diff -u src/usr.bin/make/unit-tests/cond-op.exp:1.12 src/usr.bin/make/unit-tests/cond-op.exp:1.13 --- src/usr.bin/make/unit-tests/cond-op.exp:1.12 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/cond-op.exp Thu Jul 4 20:18:40 2024 @@ -17,5 +17,5 @@ make: "cond-op.mk" line 129: Malformed c make: "cond-op.mk" line 138: Malformed conditional (1 ||) make: "cond-op.mk" line 148: Malformed conditional (0 ||) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/cond-token-string.exp diff -u src/usr.bin/make/unit-tests/cond-token-string.exp:1.12 src/usr.bin/make/unit-tests/cond-token-string.exp:1.13 --- src/usr.bin/make/unit-tests/cond-token-string.exp:1.12 Sat Apr 20 10:18:55 2024 +++ src/usr.bin/make/unit-tests/cond-token-string.exp Thu Jul 4 20:18:40 2024 @@ -17,5 +17,5 @@ CondParser_Eval: ("${VAR}") CondParser_Eval: "quoted" == quoted Comparing "quoted" == "quoted" make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-include.exp diff -u src/usr.bin/make/unit-tests/directive-include.exp:1.12 src/usr.bin/make/unit-tests/directive-include.exp:1.13 --- src/usr.bin/make/unit-tests/directive-include.exp:1.12 Sat Apr 20 10:18:55 2024 +++ src/usr.bin/make/unit-tests/directive-include.exp Thu Jul 4 20:18:40 2024 @@ -9,5 +9,5 @@ make: "directive-include.mk" line 56: Co make: "directive-include.mk" line 61: Cannot open /nonexistent make: "directive-include.mk" line 66: Invalid line 'include' make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-main-several.exp diff -u src/usr.bin/make/unit-tests/suff-main-several.exp:1.12 src/usr.bin/make/unit-tests/suff-main-several.exp:1.13 --- src/usr.bin/make/unit-tests/suff-main-several.exp:1.12 Sat May 25 22:08:35 2024 +++ src/usr.bin/make/unit-tests/suff-main-several.exp Thu Jul 4 20:18:40 2024 @@ -140,5 +140,5 @@ make: don't know how to make suff-main-s `next-main' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "next-main" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/cond-short.exp diff -u src/usr.bin/make/unit-tests/cond-short.exp:1.13 src/usr.bin/make/unit-tests/cond-short.exp:1.14 --- src/usr.bin/make/unit-tests/cond-short.exp:1.13 Thu Oct 19 18:24:33 2023 +++ src/usr.bin/make/unit-tests/cond-short.exp Thu Jul 4 20:18:40 2024 @@ -9,5 +9,5 @@ expected or exists expected or empty make: "cond-short.mk" line 231: Comparison with '<' requires both operands '' and '42' to be numeric make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt.exp diff -u src/usr.bin/make/unit-tests/deptgt.exp:1.13 src/usr.bin/make/unit-tests/deptgt.exp:1.14 --- src/usr.bin/make/unit-tests/deptgt.exp:1.13 Sat Apr 20 10:18:55 2024 +++ src/usr.bin/make/unit-tests/deptgt.exp Thu Jul 4 20:18:40 2024 @@ -13,5 +13,5 @@ make: "deptgt.mk" line 52: warning: Extr make: "deptgt.mk" line 55: warning: Extra target (ordinary) ignored make: "deptgt.mk" line 58: warning: Special and mundane targets don't mix. Mundane ones ignored make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "target1" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-unexport-env.exp diff -u src/usr.bin/make/unit-tests/directive-unexport-env.exp:1.13 src/usr.bin/make/unit-tests/directive-unexport-env.exp:1.14 --- src/usr.bin/make/unit-tests/directive-unexport-env.exp:1.13 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-unexport-env.exp Thu Jul 4 20:18:40 2024 @@ -14,5 +14,5 @@ Global: delete .MAKE.EXPORTED 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 +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-range.exp diff -u src/usr.bin/make/unit-tests/varmod-range.exp:1.13 src/usr.bin/make/unit-tests/varmod-range.exp:1.14 --- src/usr.bin/make/unit-tests/varmod-range.exp:1.13 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-range.exp Thu Jul 4 20:18:40 2024 @@ -10,5 +10,5 @@ make: "varmod-range.mk" line 105: Malfor make: "varmod-range.mk" line 114: while evaluating variable "a b c" with value "a b c": Unknown modifier "ranger" make: "varmod-range.mk" line 114: Malformed conditional ("${a b c:L:ranger}Rest" != "Rest") make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-sysv.exp diff -u src/usr.bin/make/unit-tests/varmod-sysv.exp:1.13 src/usr.bin/make/unit-tests/varmod-sysv.exp:1.14 --- src/usr.bin/make/unit-tests/varmod-sysv.exp:1.13 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-sysv.exp Thu Jul 4 20:18:40 2024 @@ -148,5 +148,5 @@ pre-middle-suffix pre%ffix=NPre%N make: "varmod-sysv.mk" line 261: while evaluating variable "error" with value "error": Unfinished modifier ('}' missing) make: "varmod-sysv.mk" line 261: Malformed conditional (${error:L:from=$(})) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/dep-percent.exp diff -u src/usr.bin/make/unit-tests/dep-percent.exp:1.2 src/usr.bin/make/unit-tests/dep-percent.exp:1.3 --- src/usr.bin/make/unit-tests/dep-percent.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/dep-percent.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ make: don't know how to make dep-percent `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/dep.exp diff -u src/usr.bin/make/unit-tests/dep.exp:1.2 src/usr.bin/make/unit-tests/dep.exp:1.3 --- src/usr.bin/make/unit-tests/dep.exp:1.2 Mon Dec 13 23:38:54 2021 +++ src/usr.bin/make/unit-tests/dep.exp Thu Jul 4 20:18:40 2024 @@ -1,5 +1,5 @@ make: "dep.mk" line 11: Inconsistent operator for only-colon make: "dep.mk" line 13: Inconsistent operator for only-colon make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-begin-fail-indirect.exp diff -u src/usr.bin/make/unit-tests/deptgt-begin-fail-indirect.exp:1.2 src/usr.bin/make/unit-tests/deptgt-begin-fail-indirect.exp:1.3 --- src/usr.bin/make/unit-tests/deptgt-begin-fail-indirect.exp:1.2 Tue Nov 24 19:04:42 2020 +++ src/usr.bin/make/unit-tests/deptgt-begin-fail-indirect.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ false *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-end-fail-all.exp diff -u src/usr.bin/make/unit-tests/deptgt-end-fail-all.exp:1.2 src/usr.bin/make/unit-tests/deptgt-end-fail-all.exp:1.3 --- src/usr.bin/make/unit-tests/deptgt-end-fail-all.exp:1.2 Mon Dec 7 01:04:06 2020 +++ src/usr.bin/make/unit-tests/deptgt-end-fail-all.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ false *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-end-fail-indirect.exp diff -u src/usr.bin/make/unit-tests/deptgt-end-fail-indirect.exp:1.2 src/usr.bin/make/unit-tests/deptgt-end-fail-indirect.exp:1.3 --- src/usr.bin/make/unit-tests/deptgt-end-fail-indirect.exp:1.2 Tue Nov 24 18:17:45 2020 +++ src/usr.bin/make/unit-tests/deptgt-end-fail-indirect.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ false *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-error.exp diff -u src/usr.bin/make/unit-tests/deptgt-error.exp:1.2 src/usr.bin/make/unit-tests/deptgt-error.exp:1.3 --- src/usr.bin/make/unit-tests/deptgt-error.exp:1.2 Sat Jan 22 21:50:41 2022 +++ src/usr.bin/make/unit-tests/deptgt-error.exp Thu Jul 4 20:18:40 2024 @@ -2,7 +2,7 @@ false fails *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests ERROR_INFO='This information is printed on 'errors'.' Making sub-error as prerequisite. Making .ERROR out of nothing. Index: src/usr.bin/make/unit-tests/deptgt-ignore.exp diff -u src/usr.bin/make/unit-tests/deptgt-ignore.exp:1.2 src/usr.bin/make/unit-tests/deptgt-ignore.exp:1.3 --- src/usr.bin/make/unit-tests/deptgt-ignore.exp:1.2 Sat Jan 22 21:50:41 2022 +++ src/usr.bin/make/unit-tests/deptgt-ignore.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ Making depends-on-ignored from error-ign `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-path-suffix.exp diff -u src/usr.bin/make/unit-tests/deptgt-path-suffix.exp:1.2 src/usr.bin/make/unit-tests/deptgt-path-suffix.exp:1.3 --- src/usr.bin/make/unit-tests/deptgt-path-suffix.exp:1.2 Mon Dec 13 23:38:54 2021 +++ src/usr.bin/make/unit-tests/deptgt-path-suffix.exp Thu Jul 4 20:18:40 2024 @@ -1,4 +1,4 @@ make: "deptgt-path-suffix.mk" line 8: Suffix '.c' not defined (yet) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/doterror.exp diff -u src/usr.bin/make/unit-tests/doterror.exp:1.2 src/usr.bin/make/unit-tests/doterror.exp:1.3 --- src/usr.bin/make/unit-tests/doterror.exp:1.2 Sun Oct 25 05:24:44 2015 +++ src/usr.bin/make/unit-tests/doterror.exp Thu Jul 4 20:18:40 2024 @@ -4,6 +4,6 @@ and now: sad *** Error code 1 Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests .ERROR: Looks like 'sad' is upset. exit status 1 Index: src/usr.bin/make/unit-tests/jobs-empty-commands-error.exp diff -u src/usr.bin/make/unit-tests/jobs-empty-commands-error.exp:1.2 src/usr.bin/make/unit-tests/jobs-empty-commands-error.exp:1.3 --- src/usr.bin/make/unit-tests/jobs-empty-commands-error.exp:1.2 Wed Jun 16 09:47:51 2021 +++ src/usr.bin/make/unit-tests/jobs-empty-commands-error.exp Thu Jul 4 20:18:40 2024 @@ -1,5 +1,5 @@ : 'Making existing-target out of nothing.' make: don't know how to make nonexistent-target (continuing) -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 2 Index: src/usr.bin/make/unit-tests/jobs-error-indirect.exp diff -u src/usr.bin/make/unit-tests/jobs-error-indirect.exp:1.2 src/usr.bin/make/unit-tests/jobs-error-indirect.exp:1.3 --- src/usr.bin/make/unit-tests/jobs-error-indirect.exp:1.2 Sun Jan 7 01:33:57 2024 +++ src/usr.bin/make/unit-tests/jobs-error-indirect.exp Thu Jul 4 20:18:40 2024 @@ -1,8 +1,8 @@ false *** [indirect] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests make: 1 error -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 2 Index: src/usr.bin/make/unit-tests/jobs-error-nested.exp diff -u src/usr.bin/make/unit-tests/jobs-error-nested.exp:1.2 src/usr.bin/make/unit-tests/jobs-error-nested.exp:1.3 --- src/usr.bin/make/unit-tests/jobs-error-nested.exp:1.2 Sun Jan 7 01:33:57 2024 +++ src/usr.bin/make/unit-tests/jobs-error-nested.exp Thu Jul 4 20:18:40 2024 @@ -2,14 +2,14 @@ make -f jobs-error-nested.mk nested false *** [nested] Error code 1 -make: stopped in unit-tests +make: stopped making "nested" in unit-tests make: 1 error -make: stopped in unit-tests +make: stopped making "nested" in unit-tests *** [all] Error code 2 -make: stopped in unit-tests +make: stopped making "all" in unit-tests make: 1 error -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 2 Index: src/usr.bin/make/unit-tests/opt-keep-going-multiple.exp diff -u src/usr.bin/make/unit-tests/opt-keep-going-multiple.exp:1.2 src/usr.bin/make/unit-tests/opt-keep-going-multiple.exp:1.3 --- src/usr.bin/make/unit-tests/opt-keep-going-multiple.exp:1.2 Mon Dec 7 01:35:33 2020 +++ src/usr.bin/make/unit-tests/opt-keep-going-multiple.exp Thu Jul 4 20:18:40 2024 @@ -5,5 +5,5 @@ false fail2 true succeed Stop. -make: stopped in unit-tests +make: stopped making "fail1 fail2 succeed" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/posix.exp diff -u src/usr.bin/make/unit-tests/posix.exp:1.2 src/usr.bin/make/unit-tests/posix.exp:1.3 --- src/usr.bin/make/unit-tests/posix.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/posix.exp Thu Jul 4 20:18:40 2024 @@ -22,5 +22,5 @@ Now we expect an error... `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/sh-jobs.exp diff -u src/usr.bin/make/unit-tests/sh-jobs.exp:1.2 src/usr.bin/make/unit-tests/sh-jobs.exp:1.3 --- src/usr.bin/make/unit-tests/sh-jobs.exp:1.2 Fri Dec 11 01:06:10 2020 +++ src/usr.bin/make/unit-tests/sh-jobs.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ comment-with-followup-line: This is prin no-comment: This is printed. *** [no-comment] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-clear-regular.exp diff -u src/usr.bin/make/unit-tests/suff-clear-regular.exp:1.2 src/usr.bin/make/unit-tests/suff-clear-regular.exp:1.3 --- src/usr.bin/make/unit-tests/suff-clear-regular.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-clear-regular.exp Thu Jul 4 20:18:40 2024 @@ -4,5 +4,5 @@ make: don't know how to make .b.a (conti `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-clear-single.exp diff -u src/usr.bin/make/unit-tests/suff-clear-single.exp:1.2 src/usr.bin/make/unit-tests/suff-clear-single.exp:1.3 --- src/usr.bin/make/unit-tests/suff-clear-single.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-clear-single.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ make: don't know how to make issue3 (con `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-self.exp diff -u src/usr.bin/make/unit-tests/suff-self.exp:1.2 src/usr.bin/make/unit-tests/suff-self.exp:1.3 --- src/usr.bin/make/unit-tests/suff-self.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-self.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ make: Graph cycles through suff-self.suf `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-transform-expand.exp diff -u src/usr.bin/make/unit-tests/suff-transform-expand.exp:1.2 src/usr.bin/make/unit-tests/suff-transform-expand.exp:1.3 --- src/usr.bin/make/unit-tests/suff-transform-expand.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-transform-expand.exp Thu Jul 4 20:18:40 2024 @@ -4,5 +4,5 @@ make: don't know how to make .first (con `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/use-inference.exp diff -u src/usr.bin/make/unit-tests/use-inference.exp:1.2 src/usr.bin/make/unit-tests/use-inference.exp:1.3 --- src/usr.bin/make/unit-tests/use-inference.exp:1.2 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/use-inference.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: don't know how to make use-inferen `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varname-make_print_var_on_error-jobs.exp diff -u src/usr.bin/make/unit-tests/varname-make_print_var_on_error-jobs.exp:1.2 src/usr.bin/make/unit-tests/varname-make_print_var_on_error-jobs.exp:1.3 --- src/usr.bin/make/unit-tests/varname-make_print_var_on_error-jobs.exp:1.2 Sun Dec 13 19:08:20 2020 +++ src/usr.bin/make/unit-tests/varname-make_print_var_on_error-jobs.exp Thu Jul 4 20:18:40 2024 @@ -2,7 +2,7 @@ echo fail all; false 'all' '${.TARGET}' fail all *** [all] Error code 1 -make: stopped in unit-tests +make: stopped making "all" in unit-tests .ERROR_TARGET='all' .ERROR_CMD='@: before '${.TARGET}' '${.TARGET}' '$${.TARGET}' echo fail ${.TARGET}; false '${.TARGET}' '${.TARGET}' '$${.TARGET}' @: after '${.TARGET}' '${.TARGET}' '$${.TARGET}'' exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-begin-fail.exp diff -u src/usr.bin/make/unit-tests/deptgt-begin-fail.exp:1.1 src/usr.bin/make/unit-tests/deptgt-begin-fail.exp:1.2 --- src/usr.bin/make/unit-tests/deptgt-begin-fail.exp:1.1 Tue Nov 24 19:02:59 2020 +++ src/usr.bin/make/unit-tests/deptgt-begin-fail.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ false *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-keep-going-indirect.exp diff -u src/usr.bin/make/unit-tests/opt-keep-going-indirect.exp:1.1 src/usr.bin/make/unit-tests/opt-keep-going-indirect.exp:1.2 --- src/usr.bin/make/unit-tests/opt-keep-going-indirect.exp:1.1 Sat Feb 12 13:17:57 2022 +++ src/usr.bin/make/unit-tests/opt-keep-going-indirect.exp Thu Jul 4 20:18:40 2024 @@ -3,14 +3,14 @@ false *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "direct" in unit-tests exited 1 direct jobs false *** [direct] Error code 1 -make: stopped in unit-tests +make: stopped making "direct" in unit-tests exited 1 indirect compat @@ -19,14 +19,14 @@ false `indirect' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "indirect" in unit-tests exited 1 indirect jobs false *** [direct] Error code 1 -make: stopped in unit-tests +make: stopped making "indirect" in unit-tests exited 1 exit status 0 Index: src/usr.bin/make/unit-tests/suff-use.exp diff -u src/usr.bin/make/unit-tests/suff-use.exp:1.1 src/usr.bin/make/unit-tests/suff-use.exp:1.2 --- src/usr.bin/make/unit-tests/suff-use.exp:1.1 Mon Feb 7 22:43:50 2022 +++ src/usr.bin/make/unit-tests/suff-use.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: don't know how to make demo.o (con `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp diff -u src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp:1.4 src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp:1.5 --- src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp:1.4 Tue Dec 26 17:12:33 2023 +++ src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp Thu Jul 4 20:18:40 2024 @@ -15,7 +15,7 @@ make: *** deptgt-delete_on_error-regular *** Error code 1 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests *** Error code 1 (ignored) Parallel mode @@ -23,27 +23,27 @@ Parallel mode *** [deptgt-delete_on_error-regular] Error code 1 make: *** deptgt-delete_on_error-regular removed -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests > deptgt-delete_on_error-regular-delete; false *** [deptgt-delete_on_error-regular-delete] Error code 1 make: *** deptgt-delete_on_error-regular-delete removed -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests > deptgt-delete_on_error-phony; false *** [deptgt-delete_on_error-phony] Error code 1 -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests > deptgt-delete_on_error-phony-delete; false *** [deptgt-delete_on_error-phony-delete] Error code 1 -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests > deptgt-delete_on_error-precious; false *** [deptgt-delete_on_error-precious] Error code 1 -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests > deptgt-delete_on_error-precious-delete; false *** [deptgt-delete_on_error-precious-delete] Error code 1 -make: stopped in unit-tests +make: stopped making "deptgt-delete_on_error-regular deptgt-delete_on_error-regular-delete deptgt-delete_on_error-phony deptgt-delete_on_error-phony-delete deptgt-delete_on_error-precious deptgt-delete_on_error-precious-delete" in unit-tests *** Error code 1 (ignored) exit status 0 Index: src/usr.bin/make/unit-tests/directive-dinclude.exp diff -u src/usr.bin/make/unit-tests/directive-dinclude.exp:1.4 src/usr.bin/make/unit-tests/directive-dinclude.exp:1.5 --- src/usr.bin/make/unit-tests/directive-dinclude.exp:1.4 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-dinclude.exp Thu Jul 4 20:18:40 2024 @@ -1,5 +1,5 @@ make: "directive-dinclude-error.inc" line 1: Invalid line 'syntax error' in directive-dinclude.mk:21 make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-for-generating-endif.exp diff -u src/usr.bin/make/unit-tests/directive-for-generating-endif.exp:1.4 src/usr.bin/make/unit-tests/directive-for-generating-endif.exp:1.5 --- src/usr.bin/make/unit-tests/directive-for-generating-endif.exp:1.4 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-for-generating-endif.exp Thu Jul 4 20:18:40 2024 @@ -6,5 +6,5 @@ make: "directive-for-generating-endif.mk in .for loop from directive-for-generating-endif.mk:20 with i = 1 make: "directive-for-generating-endif.mk" line 30: 3 open conditionals make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-for-if.exp diff -u src/usr.bin/make/unit-tests/directive-for-if.exp:1.4 src/usr.bin/make/unit-tests/directive-for-if.exp:1.5 --- src/usr.bin/make/unit-tests/directive-for-if.exp:1.4 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-for-if.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ make: "directive-for-if.mk" line 51: if- VAR1 VAR3 make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "." in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-for-null.exp diff -u src/usr.bin/make/unit-tests/directive-for-null.exp:1.4 src/usr.bin/make/unit-tests/directive-for-null.exp:1.5 --- src/usr.bin/make/unit-tests/directive-for-null.exp:1.4 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-for-null.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: "(stdin)" line 2: Zero byte read f *** Error code 2 (continuing) Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-hyphen-include.exp diff -u src/usr.bin/make/unit-tests/directive-hyphen-include.exp:1.4 src/usr.bin/make/unit-tests/directive-hyphen-include.exp:1.5 --- src/usr.bin/make/unit-tests/directive-hyphen-include.exp:1.4 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-hyphen-include.exp Thu Jul 4 20:18:40 2024 @@ -1,5 +1,5 @@ make: "directive-hyphen-include-error.inc" line 1: Invalid line 'syntax error' in directive-hyphen-include.mk:20 make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-sinclude.exp diff -u src/usr.bin/make/unit-tests/directive-sinclude.exp:1.4 src/usr.bin/make/unit-tests/directive-sinclude.exp:1.5 --- src/usr.bin/make/unit-tests/directive-sinclude.exp:1.4 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-sinclude.exp Thu Jul 4 20:18:40 2024 @@ -1,5 +1,5 @@ make: "directive-include-error.inc" line 1: Invalid line 'syntax error' in directive-sinclude.mk:20 make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/jobs-error-nested-make.exp diff -u src/usr.bin/make/unit-tests/jobs-error-nested-make.exp:1.4 src/usr.bin/make/unit-tests/jobs-error-nested-make.exp:1.5 --- src/usr.bin/make/unit-tests/jobs-error-nested-make.exp:1.4 Sun Jan 7 01:33:57 2024 +++ src/usr.bin/make/unit-tests/jobs-error-nested-make.exp Thu Jul 4 20:18:40 2024 @@ -2,10 +2,10 @@ make -f jobs-error-nested-make.mk nested false *** [nested] Error code 1 -make: stopped in unit-tests +make: stopped making "nested" in unit-tests make: 1 error -make: stopped in unit-tests +make: stopped making "nested" in unit-tests -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 2 Index: src/usr.bin/make/unit-tests/opt-keep-going.exp diff -u src/usr.bin/make/unit-tests/opt-keep-going.exp:1.4 src/usr.bin/make/unit-tests/opt-keep-going.exp:1.5 --- src/usr.bin/make/unit-tests/opt-keep-going.exp:1.4 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/opt-keep-going.exp Thu Jul 4 20:18:40 2024 @@ -5,5 +5,5 @@ other 1 `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-add-later.exp diff -u src/usr.bin/make/unit-tests/suff-add-later.exp:1.4 src/usr.bin/make/unit-tests/suff-add-later.exp:1.5 --- src/usr.bin/make/unit-tests/suff-add-later.exp:1.4 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-add-later.exp Thu Jul 4 20:18:40 2024 @@ -17,5 +17,5 @@ make: don't know how to make issue5e.d ( `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-transform-endless.exp diff -u src/usr.bin/make/unit-tests/suff-transform-endless.exp:1.4 src/usr.bin/make/unit-tests/suff-transform-endless.exp:1.5 --- src/usr.bin/make/unit-tests/suff-transform-endless.exp:1.4 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-transform-endless.exp Thu Jul 4 20:18:40 2024 @@ -42,5 +42,5 @@ make: Graph cycles through issue6.f `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/suff-transform-select.exp diff -u src/usr.bin/make/unit-tests/suff-transform-select.exp:1.4 src/usr.bin/make/unit-tests/suff-transform-select.exp:1.5 --- src/usr.bin/make/unit-tests/suff-transform-select.exp:1.4 Mon Dec 7 00:53:30 2020 +++ src/usr.bin/make/unit-tests/suff-transform-select.exp Thu Jul 4 20:18:40 2024 @@ -43,5 +43,5 @@ make: don't know how to make issue10.e ( `all' not remade because of errors. Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-info.exp diff -u src/usr.bin/make/unit-tests/directive-info.exp:1.8 src/usr.bin/make/unit-tests/directive-info.exp:1.9 --- src/usr.bin/make/unit-tests/directive-info.exp:1.8 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/directive-info.exp Thu Jul 4 20:18:40 2024 @@ -11,5 +11,5 @@ make: "directive-info.mk" line 36: Unkno make: "directive-info.mk" line 38: no-target: no-source make: "directive-info.mk" line 47: expect line 35 for multi-line message make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making ".info.man" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-debug-graph2.exp diff -u src/usr.bin/make/unit-tests/opt-debug-graph2.exp:1.8 src/usr.bin/make/unit-tests/opt-debug-graph2.exp:1.9 --- src/usr.bin/make/unit-tests/opt-debug-graph2.exp:1.8 Tue May 7 18:26:22 2024 +++ src/usr.bin/make/unit-tests/opt-debug-graph2.exp Thu Jul 4 20:18:40 2024 @@ -90,5 +90,5 @@ MFLAGS = -r -k -d g2 #*** Transformations: Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt-debug-graph3.exp diff -u src/usr.bin/make/unit-tests/opt-debug-graph3.exp:1.8 src/usr.bin/make/unit-tests/opt-debug-graph3.exp:1.9 --- src/usr.bin/make/unit-tests/opt-debug-graph3.exp:1.8 Tue May 7 18:26:22 2024 +++ src/usr.bin/make/unit-tests/opt-debug-graph3.exp Thu Jul 4 20:18:40 2024 @@ -90,5 +90,5 @@ MFLAGS = -r -k -d g3 #*** Transformations: Stop. -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/opt.exp diff -u src/usr.bin/make/unit-tests/opt.exp:1.8 src/usr.bin/make/unit-tests/opt.exp:1.9 --- src/usr.bin/make/unit-tests/opt.exp:1.8 Mon Dec 7 01:35:33 2020 +++ src/usr.bin/make/unit-tests/opt.exp Thu Jul 4 20:18:40 2024 @@ -13,7 +13,7 @@ make: don't know how to make -f (continu `/dev/null' is up to date. Stop. -make: stopped in unit-tests +make: stopped making "-f /dev/null" in unit-tests *** Error code 1 (ignored) make -? Index: src/usr.bin/make/unit-tests/var-recursive.exp diff -u src/usr.bin/make/unit-tests/var-recursive.exp:1.8 src/usr.bin/make/unit-tests/var-recursive.exp:1.9 --- src/usr.bin/make/unit-tests/var-recursive.exp:1.8 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/var-recursive.exp Thu Jul 4 20:18:40 2024 @@ -18,5 +18,5 @@ make: stopped in unit-tests : OK In a command near "var-recursive.mk" line 57: make[1]: Variable VAR is recursive. -make: stopped in unit-tests +make: stopped making "target" in unit-tests exit status 0 Index: src/usr.bin/make/unit-tests/varmod-loop-varname.exp diff -u src/usr.bin/make/unit-tests/varmod-loop-varname.exp:1.8 src/usr.bin/make/unit-tests/varmod-loop-varname.exp:1.9 --- src/usr.bin/make/unit-tests/varmod-loop-varname.exp:1.8 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-loop-varname.exp Thu Jul 4 20:18:40 2024 @@ -7,5 +7,5 @@ make: "varmod-loop-varname.mk" line 96: make: "varmod-loop-varname.mk" line 103: while evaluating variable "1 2 3" with value "1 2 3": In the :@ modifier, the variable name "v$$$" must not contain a dollar make: "varmod-loop-varname.mk" line 103: Malformed conditional (${1 2 3:L:@v$$$@($v)@} != "() () ()") make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-undef.exp diff -u src/usr.bin/make/unit-tests/directive-undef.exp:1.11 src/usr.bin/make/unit-tests/directive-undef.exp:1.12 --- src/usr.bin/make/unit-tests/directive-undef.exp:1.11 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/directive-undef.exp Thu Jul 4 20:18:40 2024 @@ -2,5 +2,5 @@ make: "directive-undef.mk" line 30: The make: "directive-undef.mk" line 88: while evaluating variable "VARNAMES" with value "VARNAMES": Unknown modifier "Z" make: "directive-undef.mk" line 105: warning: UT_EXPORTED is still listed in .MAKE.EXPORTED even though spaceit is not exported anymore. make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/var-eval-short.exp diff -u src/usr.bin/make/unit-tests/var-eval-short.exp:1.26 src/usr.bin/make/unit-tests/var-eval-short.exp:1.27 --- src/usr.bin/make/unit-tests/var-eval-short.exp:1.26 Sun Jun 2 15:31:26 2024 +++ src/usr.bin/make/unit-tests/var-eval-short.exp Thu Jul 4 20:18:40 2024 @@ -27,5 +27,5 @@ ParseDependency(.MAKEFLAGS: -d0) Global: .MAKEFLAGS = -r -k -d cpv -d Global: .MAKEFLAGS = -r -k -d cpv -d 0 make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/var-op-expand.exp diff -u src/usr.bin/make/unit-tests/var-op-expand.exp:1.10 src/usr.bin/make/unit-tests/var-op-expand.exp:1.11 --- src/usr.bin/make/unit-tests/var-op-expand.exp:1.10 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/var-op-expand.exp Thu Jul 4 20:18:40 2024 @@ -3,5 +3,5 @@ make: "var-op-expand.mk" line 278: warni make: "var-op-expand.mk" line 283: while evaluating variable "indirect" with value "${later:s,value,replaced,} ok ${later:value=sysv}": while evaluating variable "later" with value "lowercase-value": Unknown modifier "s,value,replaced," make: "var-op-expand.mk" line 285: warning: XXX Neither branch should be taken. make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-order.exp diff -u src/usr.bin/make/unit-tests/varmod-order.exp:1.10 src/usr.bin/make/unit-tests/varmod-order.exp:1.11 --- src/usr.bin/make/unit-tests/varmod-order.exp:1.10 Thu Jul 4 18:53:37 2024 +++ src/usr.bin/make/unit-tests/varmod-order.exp Thu Jul 4 20:18:40 2024 @@ -22,5 +22,5 @@ make: "varmod-order.mk" line 97: Malform make: "varmod-order.mk" line 112: while evaluating variable "SWITCH" with value "On": Bad modifier ":On=Off" make: "varmod-order.mk" line 112: Malformed conditional (${SWITCH:On=Off} != "Off") make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-edge.exp diff -u src/usr.bin/make/unit-tests/varmod-edge.exp:1.19 src/usr.bin/make/unit-tests/varmod-edge.exp:1.20 --- src/usr.bin/make/unit-tests/varmod-edge.exp:1.19 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-edge.exp Thu Jul 4 20:18:40 2024 @@ -26,5 +26,5 @@ make: "varmod-edge.mk" line 196: Malform make: "varmod-edge.mk" line 210: while evaluating "${:S,}": Unfinished modifier (',' missing) make: "varmod-edge.mk" line 210: Malformed conditional (${:S,}) make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-gmtime.exp diff -u src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.18 src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.19 --- src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.18 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-gmtime.exp Thu Jul 4 20:18:40 2024 @@ -9,5 +9,5 @@ make: "varmod-gmtime.mk" line 133: Malfo make: "varmod-gmtime.mk" line 144: while evaluating variable "%Y" with value "%Y": Invalid time value "100000S,1970,bad," make: "varmod-gmtime.mk" line 144: Malformed conditional (${%Y:L:gmtime=100000S,1970,bad,} != "bad") make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-localtime.exp diff -u src/usr.bin/make/unit-tests/varmod-localtime.exp:1.15 src/usr.bin/make/unit-tests/varmod-localtime.exp:1.16 --- src/usr.bin/make/unit-tests/varmod-localtime.exp:1.15 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-localtime.exp Thu Jul 4 20:18:40 2024 @@ -9,5 +9,5 @@ make: "varmod-localtime.mk" line 133: Ma make: "varmod-localtime.mk" line 144: while evaluating variable "%Y" with value "%Y": Invalid time value "100000S,1970,bad," make: "varmod-localtime.mk" line 144: Malformed conditional (${%Y:L:localtime=100000S,1970,bad,} != "bad") make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-match-escape.exp diff -u src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.21 src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.22 --- src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.21 Thu Jul 4 17:47:54 2024 +++ src/usr.bin/make/unit-tests/varmod-match-escape.exp Thu Jul 4 20:18:40 2024 @@ -37,5 +37,5 @@ make: "varmod-match-escape.mk" line 69: make: "varmod-match-escape.mk" line 110: warning: while evaluating variable "WORDS" with value "A A] A]] B B] B]] ] ]] ]]] a a] a]]": Unfinished character list in pattern '[A-]' of modifier ':M' make: "varmod-match-escape.mk" line 110: warning: while evaluating variable "WORDS" with value "A A] A]] B B] B]] ] ]] ]]] a a] a]]": Unfinished character list in pattern '[^A-]' of modifier ':M' make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests +make: stopped making "all" in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varname.exp diff -u src/usr.bin/make/unit-tests/varname.exp:1.20 src/usr.bin/make/unit-tests/varname.exp:1.21 --- src/usr.bin/make/unit-tests/varname.exp:1.20 Sat Aug 19 11:09:02 2023 +++ src/usr.bin/make/unit-tests/varname.exp Thu Jul 4 20:18:40 2024 @@ -17,5 +17,5 @@ Global: VAR((( = try3 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 +make: stopped making "all" in unit-tests exit status 1