[src/trunk]: src/usr.bin/make/unit-tests Ensure consistent results on differe...

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

details:   https://anonhg.NetBSD.org/src/rev/4a541b97bd9f
branches:  trunk
changeset: 827017:4a541b97bd9f
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sun Oct 08 20:44:19 2017 +0000

description:
Ensure consistent results on different platforms.

With cycle.1.99 being written to stdout and
make: Graph cycles through `cycle.2.*`
to stderr, the order in which they are captured
varies on some platforms.
By redirecting stderr through the same pipe
as stdout we get more consistent result.

diffstat:

 usr.bin/make/unit-tests/dotwait.exp |  4 ++--
 usr.bin/make/unit-tests/dotwait.mk  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 4fedf0706537 -r 4a541b97bd9f usr.bin/make/unit-tests/dotwait.exp
--- a/usr.bin/make/unit-tests/dotwait.exp       Sun Oct 08 20:40:06 2017 +0000
+++ b/usr.bin/make/unit-tests/dotwait.exp       Sun Oct 08 20:44:19 2017 +0000
@@ -22,9 +22,9 @@
 shared.2.1
 shared.2.99
 shared.2.99
+cycle.1.99
+cycle.1.99
 make: Graph cycles through `cycle.2.99'
 make: Graph cycles through `cycle.2.98'
 make: Graph cycles through `cycle.2.97'
-cycle.1.99
-cycle.1.99
 exit status 0
diff -r 4fedf0706537 -r 4a541b97bd9f usr.bin/make/unit-tests/dotwait.mk
--- a/usr.bin/make/unit-tests/dotwait.mk        Sun Oct 08 20:40:06 2017 +0000
+++ b/usr.bin/make/unit-tests/dotwait.mk        Sun Oct 08 20:44:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dotwait.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: dotwait.mk,v 1.2 2017/10/08 20:44:19 sjg Exp $
 
 THISMAKEFILE:= ${.PARSEDIR}/${.PARSEFILE}
 
@@ -11,7 +11,7 @@
 # Ignore "--- target ---" lines printed by parallel make.
 all:
 .for t in ${TESTS}
-       @${.MAKE} -f ${THISMAKEFILE} -j4 $t | grep -v "^--- "
+       @${.MAKE} -f ${THISMAKEFILE} -j4 $t 2>&1 | grep -v "^--- "
 .endfor
 
 #