summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2021-04-27 16:23:21 +0000
committerrillig <rillig@NetBSD.org>2021-04-27 16:23:21 +0000
commitaafe41db30cbd6510fc0defabcd05eeb42ccf9f8 (patch)
treedba8b93d4bfa68fe03eb8228aa87826eab207a7b
parentb756cc91c8a5bfcb72d49b3ee1bd0702843f7df8 (diff)
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.
-rw-r--r--usr.bin/make/job.c6
-rw-r--r--usr.bin/make/unit-tests/opt-debug-errors-jobs.exp10
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index e9692f59117..047f1dba63e 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -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 @@ DebugFailedJob(const Job *job)
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 --git a/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp b/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
index c4cffbc7a23..25eb2b470b7 100644
--- a/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
+++ b/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
@@ -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 @@ make: stopped in unit-tests
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 @@ line2'; false
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 @@ make: stopped in unit-tests
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 @@ make: stopped in unit-tests
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