Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make: remove stray space in -de output in jobs ...
details: https://anonhg.NetBSD.org/src/rev/148b88ed007a
branches: trunk
changeset: 982830:148b88ed007a
user: rillig <rillig%NetBSD.org@localhost>
date: Tue Apr 27 16:23:21 2021 +0000
description:
make: remove stray space in -de output in jobs mode
In compat mode, having a space in this place makes sense to align the
target name with the command. In jobs mode, since each command is
listed in a separate line, there is no need for the double space.
diffstat:
usr.bin/make/job.c | 6 +++---
usr.bin/make/unit-tests/opt-debug-errors-jobs.exp | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diffs (75 lines):
diff -r ffde130d2c5a -r 148b88ed007a usr.bin/make/job.c
--- a/usr.bin/make/job.c Tue Apr 27 16:20:06 2021 +0000
+++ b/usr.bin/make/job.c Tue Apr 27 16:23:21 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.430 2021/04/27 15:21:42 christos Exp $ */
+/* $NetBSD: job.c,v 1.431 2021/04/27 16:23:21 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.430 2021/04/27 15:21:42 christos Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.431 2021/04/27 16:23:21 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1068,7 +1068,7 @@
if (!DEBUG(ERROR))
return;
- debug_printf("\n*** Failed target: %s\n*** Failed commands:\n",
+ debug_printf("\n*** Failed target: %s\n*** Failed commands:\n",
job->node->name);
for (l = job->node->commands.first; l != NULL; l = l->next) {
debug_printf("\t%s\n", (const char *)l->datum);
diff -r ffde130d2c5a -r 148b88ed007a usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
--- a/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Tue Apr 27 16:20:06 2021 +0000
+++ b/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Tue Apr 27 16:23:21 2021 +0000
@@ -1,7 +1,7 @@
echo '3 spaces'; false
3 spaces
-*** Failed target: fail-spaces
+*** Failed target: fail-spaces
*** Failed commands:
echo '3 spaces'; false
*** [fail-spaces] Error code 1
@@ -10,7 +10,7 @@
echo \ indented; false
indented
-*** Failed target: fail-escaped-space
+*** Failed target: fail-escaped-space
*** Failed commands:
echo \ indented; false
*** [fail-escaped-space] Error code 1
@@ -21,7 +21,7 @@
line1
line2
-*** Failed target: fail-newline
+*** Failed target: fail-newline
*** Failed commands:
echo 'line1${.newline}line2'; false
*** [fail-newline] Error code 1
@@ -30,7 +30,7 @@
echo 'line1 line2'; false
line1 line2
-*** Failed target: fail-multiline
+*** Failed target: fail-multiline
*** Failed commands:
echo 'line1 line2'; false
*** [fail-multiline] Error code 1
@@ -39,7 +39,7 @@
echo 'word1' 'word2'; false
word1 word2
-*** Failed target: fail-multiline-intention
+*** Failed target: fail-multiline-intention
*** Failed commands:
echo 'word1' 'word2'; false
*** [fail-multiline-intention] Error code 1
Home |
Main Index |
Thread Index |
Old Index