Module Name: src Committed By: sjg Date: Sun Jan 7 01:33:58 UTC 2024
Modified Files: src/usr.bin/make: job.c main.c src/usr.bin/make/unit-tests: jobs-error-indirect.exp jobs-error-nested-make.exp jobs-error-nested.exp var-recursive.exp Log Message: make: more consistent error messages Move %s: progname from Job_CheckCommands to Fatal to avoid is being repeated when Job_CheckCommands is passed Error. This means some errors from var also report progname (and level) which is useful. Reviewed by: rillig To generate a diff of this commit: cvs rdiff -u -r1.463 -r1.464 src/usr.bin/make/job.c cvs rdiff -u -r1.608 -r1.609 src/usr.bin/make/main.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/jobs-error-indirect.exp \ src/usr.bin/make/unit-tests/jobs-error-nested.exp cvs rdiff -u -r1.3 -r1.4 \ src/usr.bin/make/unit-tests/jobs-error-nested-make.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/var-recursive.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/job.c diff -u src/usr.bin/make/job.c:1.463 src/usr.bin/make/job.c:1.464 --- src/usr.bin/make/job.c:1.463 Fri Jan 5 23:22:06 2024 +++ src/usr.bin/make/job.c Sun Jan 7 01:33:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.463 2024/01/05 23:22:06 rillig Exp $ */ +/* $NetBSD: job.c,v 1.464 2024/01/07 01:33:57 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -141,7 +141,7 @@ #include "trace.h" /* "@(#)job.c 8.2 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: job.c,v 1.463 2024/01/05 23:22:06 rillig Exp $"); +MAKE_RCSID("$NetBSD: job.c,v 1.464 2024/01/07 01:33:57 sjg Exp $"); /* * A shell defines how the commands are run. All commands for a target are @@ -1379,7 +1379,7 @@ Job_CheckCommands(GNode *gn, void (*abor return false; } - abortProc("%s: don't know how to make %s. Stop", progname, gn->name); + abortProc("don't know how to make %s. Stop", gn->name); return false; } Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.608 src/usr.bin/make/main.c:1.609 --- src/usr.bin/make/main.c:1.608 Fri Jan 5 23:22:06 2024 +++ src/usr.bin/make/main.c Sun Jan 7 01:33:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.608 2024/01/05 23:22:06 rillig Exp $ */ +/* $NetBSD: main.c,v 1.609 2024/01/07 01:33:57 sjg 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.608 2024/01/05 23:22:06 rillig Exp $"); +MAKE_RCSID("$NetBSD: main.c,v 1.609 2024/01/07 01:33:57 sjg Exp $"); #if defined(MAKE_NATIVE) __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 " "The Regents of the University of California. " @@ -1851,6 +1851,7 @@ Fatal(const char *fmt, ...) Job_Wait(); (void)fflush(stdout); + fprintf(stderr, "%s: ", progname); va_start(ap, fmt); (void)vfprintf(stderr, fmt, ap); va_end(ap); Index: src/usr.bin/make/unit-tests/jobs-error-indirect.exp diff -u src/usr.bin/make/unit-tests/jobs-error-indirect.exp:1.1 src/usr.bin/make/unit-tests/jobs-error-indirect.exp:1.2 --- src/usr.bin/make/unit-tests/jobs-error-indirect.exp:1.1 Tue Dec 1 17:50:04 2020 +++ src/usr.bin/make/unit-tests/jobs-error-indirect.exp Sun Jan 7 01:33:57 2024 @@ -2,7 +2,7 @@ false *** [indirect] Error code 1 make: stopped in unit-tests -1 error +make: 1 error make: stopped 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.1 src/usr.bin/make/unit-tests/jobs-error-nested.exp:1.2 --- src/usr.bin/make/unit-tests/jobs-error-nested.exp:1.1 Tue Dec 1 17:50:04 2020 +++ src/usr.bin/make/unit-tests/jobs-error-nested.exp Sun Jan 7 01:33:57 2024 @@ -3,13 +3,13 @@ false *** [nested] Error code 1 make: stopped in unit-tests -1 error +make: 1 error make: stopped in unit-tests *** [all] Error code 2 make: stopped in unit-tests -1 error +make: 1 error make: stopped in unit-tests exit status 2 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.3 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.3 Fri Jan 8 21:46:50 2021 +++ src/usr.bin/make/unit-tests/jobs-error-nested-make.exp Sun Jan 7 01:33:57 2024 @@ -3,7 +3,7 @@ false *** [nested] Error code 1 make: stopped in unit-tests -1 error +make: 1 error make: stopped in unit-tests Index: src/usr.bin/make/unit-tests/var-recursive.exp diff -u src/usr.bin/make/unit-tests/var-recursive.exp:1.6 src/usr.bin/make/unit-tests/var-recursive.exp:1.7 --- src/usr.bin/make/unit-tests/var-recursive.exp:1.6 Thu Jun 1 20:56:35 2023 +++ src/usr.bin/make/unit-tests/var-recursive.exp Sun Jan 7 01:33:57 2024 @@ -1,19 +1,19 @@ make: "var-recursive.mk" line 21: still there -Variable DIRECT is recursive. +make: Variable DIRECT is recursive. in var-recursive.mk:22 make: stopped in unit-tests -Variable INDIRECT1 is recursive. +make: Variable INDIRECT1 is recursive. in var-recursive.mk:29 make: stopped in unit-tests make: "var-recursive.mk" line 37: ok -Variable V is recursive. +make: Variable V is recursive. in var-recursive.mk:45 make: stopped in unit-tests : OK -In a command near "var-recursive.mk" line 57: Variable VAR is recursive. +In a command near "var-recursive.mk" line 57: make[1]: Variable VAR is recursive. make: stopped in unit-tests exit status 0