d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include target names in diagnostic output.

Browse Source 
Submitted by:	Garrett Cooper
This commit is contained in:
Max Khon 2012-02-12 05:34:01 +00:00
parent 36fb423e4f
commit 42e4b4f7df
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=231544
2 changed files with 75 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
tools/regression/usr.bin/make/execution/joberr/expected.stdout.1
View File

@ -1,90 +1,90 @@
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** [do-check-joberr] Error code 1
Error: build failed
*** Error code 1
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** Error code 2 (ignored)
*** [do-check-joberr] Error code 1
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)
*** [check-joberr] Error code 2 (ignored)

23
usr.bin/make/job.c
View File

@ -954,17 +954,19 @@ JobFinish(Job *job, int *status)
lastNode = job->node;
}
fprintf(out,
"*** Completed successfully\n");
"*** [%s] Completed successfully\n",
job->node->name);
}
} else {
if (usePipes && job->node != lastNode) {
MESSAGE(out, job->node);
lastNode = job->node;
}
fprintf(out, "*** Error code %d%s\n",
fprintf(out, "*** [%s] Error code %d%s\n",
job->node->name,
WEXITSTATUS(*status),
(job->flags & JOB_IGNERR) ?
"(ignored)" : "");
" (ignored)" : "");
if (job->flags & JOB_IGNERR) {
*status = 0;
@ -1005,7 +1007,8 @@ JobFinish(Job *job, int *status)
MESSAGE(out, job->node);
lastNode = job->node;
}
fprintf(out, "*** Continued\n");
fprintf(out, "*** [%s] Continued\n",
job->node->name);
}
if (!(job->flags & JOB_CONTINUING)) {
DEBUGF(JOB, ("Warning: process %jd was not "
@ -1029,7 +1032,8 @@ JobFinish(Job *job, int *status)
lastNode = job->node;
}
fprintf(out,
"*** Signal %d\n", WTERMSIG(*status));
"*** [%s] Signal %d\n", job->node->name,
WTERMSIG(*status));
fflush(out);
}
}
@ -1056,7 +1060,8 @@ JobFinish(Job *job, int *status)
MESSAGE(out, job->node);
lastNode = job->node;
}
fprintf(out, "*** Stopped -- signal %d\n", WSTOPSIG(*status));
fprintf(out, "*** [%s] Stopped -- signal %d\n",
job->node->name, WSTOPSIG(*status));
job->flags |= JOB_RESUME;
TAILQ_INSERT_TAIL(&stoppedJobs, job, link);
fflush(out);
@ -3034,13 +3039,15 @@ Compat_RunCommand(LstNode *cmdNode, GNode *gn)
if (status == 0) {
return (0);
} else {
printf("*** Error code %d", status);
printf("*** [%s] Error code %d",
gn->name, status);
}
} else if (WIFSTOPPED(reason)) {
status = WSTOPSIG(reason);
} else {
status = WTERMSIG(reason);
printf("*** Signal %d", status);
printf("*** [%s] Signal %d",
gn->name, status);
}
if (ps.errCheck) {