Module Name: src
Committed By: rillig
Date: Sun Nov 8 00:54:06 UTC 2020
Modified Files:
src/usr.bin/make: job.c
src/usr.bin/make/unit-tests: opt-debug-jobs.exp
Log Message:
make(1): clean up debug output for running jobs
There is no remote anymore, therefore mentioning locally is redundant.
It was a bad idea anyway to build format strings that work with parts of
words.
To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/usr.bin/make/job.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/opt-debug-jobs.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.310 src/usr.bin/make/job.c:1.311
--- src/usr.bin/make/job.c:1.310 Sat Nov 7 21:24:33 2020
+++ src/usr.bin/make/job.c Sun Nov 8 00:54:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.310 2020/11/07 21:24:33 rillig Exp $ */
+/* $NetBSD: job.c,v 1.311 2020/11/08 00:54:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.310 2020/11/07 21:24:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.311 2020/11/08 00:54:06 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -1279,7 +1279,7 @@ JobExec(Job *job, char **argv)
if (DEBUG(JOB)) {
int i;
- debug_printf("Running %s %sly\n", job->node->name, "local");
+ debug_printf("Running %s\n", job->node->name);
debug_printf("\tCommand: ");
for (i = 0; argv[i] != NULL; i++) {
debug_printf("%s ", argv[i]);
Index: src/usr.bin/make/unit-tests/opt-debug-jobs.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.5 src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.6
--- src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.5 Thu Oct 8 17:54:20 2020
+++ src/usr.bin/make/unit-tests/opt-debug-jobs.exp Sun Nov 8 00:54:06 2020
@@ -10,7 +10,7 @@ echo ": variable"
echo ": 'single' and \"double\" quotes"
{ : 'single' and "double" quotes
} || exit $?
-Running all locally
+Running all
Command: sh
JobExec(all): pid <pid> added to jobs table
job table @ job started
