Module Name: src Committed By: sjg Date: Sun Dec 13 05:13:38 UTC 2020
Modified Files: src/usr.bin/make/unit-tests: Makefile sh-errctl.exp Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.247 -r1.248 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/sh-errctl.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/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.247 src/usr.bin/make/unit-tests/Makefile:1.248 --- src/usr.bin/make/unit-tests/Makefile:1.247 Sun Dec 13 02:09:33 2020 +++ src/usr.bin/make/unit-tests/Makefile Sun Dec 13 05:13:38 2020 @@ -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 @@ STD_SED_CMDS.dg1+= -e 's,^\(MAKE *=\) .* # 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 Index: src/usr.bin/make/unit-tests/sh-errctl.exp diff -u src/usr.bin/make/unit-tests/sh-errctl.exp:1.1 src/usr.bin/make/unit-tests/sh-errctl.exp:1.2 --- src/usr.bin/make/unit-tests/sh-errctl.exp:1.1 Sat Dec 12 15:06:11 2020 +++ src/usr.bin/make/unit-tests/sh-errctl.exp Sun Dec 13 05:13:38 2020 @@ -22,8 +22,6 @@ job 0, status 3, flags ---, pid <pid> 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