Module Name: src
Committed By: rillig
Date: Wed Feb 9 20:52:06 UTC 2022
Modified Files:
src/usr.bin/make: main.c
src/usr.bin/make/unit-tests: Makefile objdir-writable.exp
Log Message:
make: prefix the warning about read-only .OBJDIR with a colon
For consistency with the other warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.577 -r1.578 src/usr.bin/make/main.c
cvs rdiff -u -r1.304 -r1.305 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/objdir-writable.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.577 src/usr.bin/make/main.c:1.578
--- src/usr.bin/make/main.c:1.577 Sat Jan 29 09:38:26 2022
+++ src/usr.bin/make/main.c Wed Feb 9 20:52:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.577 2022/01/29 09:38:26 rillig Exp $ */
+/* $NetBSD: main.c,v 1.578 2022/02/09 20:52:06 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.577 2022/01/29 09:38:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.578 2022/02/09 20:52:06 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -718,7 +718,7 @@ Main_SetObjdir(bool writable, const char
return false;
if ((writable && access(path, W_OK) != 0) || chdir(path) != 0) {
- (void)fprintf(stderr, "%s warning: %s: %s.\n",
+ (void)fprintf(stderr, "%s: warning: %s: %s.\n",
progname, path, strerror(errno));
return false;
}
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.304 src/usr.bin/make/unit-tests/Makefile:1.305
--- src/usr.bin/make/unit-tests/Makefile:1.304 Wed Feb 9 18:54:19 2022
+++ src/usr.bin/make/unit-tests/Makefile Wed Feb 9 20:52:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.304 2022/02/09 18:54:19 rillig Exp $
+# $NetBSD: Makefile,v 1.305 2022/02/09 20:52:06 rillig Exp $
#
# Unit tests for make(1)
#
@@ -688,7 +688,6 @@ LIMIT_RESOURCES?= :
# 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,'
-_SED_CMDS+= -e 's,${TEST_MAKE:T:S,.,\\.,g}[][0-9]* warning,make warning,'
_SED_CMDS+= -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,'
# replace anything after 'stopped in' with unit-tests
_SED_CMDS+= -e '/stopped/s, /.*, unit-tests,'
Index: src/usr.bin/make/unit-tests/objdir-writable.exp
diff -u src/usr.bin/make/unit-tests/objdir-writable.exp:1.4 src/usr.bin/make/unit-tests/objdir-writable.exp:1.5
--- src/usr.bin/make/unit-tests/objdir-writable.exp:1.4 Wed Feb 9 18:54:19 2022
+++ src/usr.bin/make/unit-tests/objdir-writable.exp Wed Feb 9 20:52:06 2022
@@ -1,4 +1,4 @@
-make warning: <tmpdir>/roobj: Permission denied.
+make: warning: <tmpdir>/roobj: Permission denied.
<tmpdir>
<tmpdir>/roobj
<tmpdir>/roobj
