[src/trunk]: src/usr.bin/make/unit-tests Prune job debug output that may appe...

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/173316d85b25
branches:  trunk
changeset: 957862:173316d85b25
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sun Dec 13 05:13:38 2020 +0000

description:
Prune job debug output that may appear out of order.

A race between child and parent means that we cannot
guarantee whether all child output is seen before we call
JobClosePipes, thus intervening debug output can appear
before or after the last child output.

diffstat:

 usr.bin/make/unit-tests/Makefile      |  5 ++---
 usr.bin/make/unit-tests/sh-errctl.exp |  2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r fbc65799e0ec -r 173316d85b25 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun Dec 13 02:15:49 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun Dec 13 05:13:38 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.247 2020/12/13 02:09:33 sjg Exp $
+# $NetBSD: Makefile,v 1.248 2020/12/13 05:13:38 sjg Exp $
 #
 # Unit tests for make(1)
 #
@@ -537,11 +537,10 @@
 
 # Omit details such as process IDs from the output of the -dj option.
 STD_SED_CMDS.dj= \
+       -e '/Process/d;/JobFinish:/d' \
        -e 's,^\(Job_TokenWithdraw\)([0-9]*),\1(<pid>),' \
        -e 's,^([0-9][0-9]*) \(withdrew token\),(<pid>) \1,' \
        -e 's, \(pid\) [0-9][0-9]*, \1 <pid>,' \
-       -e 's,^\(Process\) [0-9][0-9]*,\1 <pid>,' \
-       -e 's,^\(JobFinish:\) [0-9][0-9]*,\1 <pid>,' \
        -e 's,^\(       Command:\) .*,\1 <shell>,'
 
 # Reduce the noise for tests running with the -n option, since there is no
diff -r fbc65799e0ec -r 173316d85b25 usr.bin/make/unit-tests/sh-errctl.exp
--- a/usr.bin/make/unit-tests/sh-errctl.exp     Sun Dec 13 02:15:49 2020 +0000
+++ b/usr.bin/make/unit-tests/sh-errctl.exp     Sun Dec 13 05:13:38 2020 +0000
@@ -22,8 +22,6 @@
 silent
 ignerr
 always
-Process <pid> exited/stopped status 0.
-JobFinish: <pid> [all], status 0
 Job_TokenWithdraw(<pid>): aborting 0, running 0
 (<pid>) withdrew token
 exit status 0