Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
sjg 2017-10-08 20:44:19 +00:00
parent 5be17a4780
commit 55844d12fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/unit-tests/dotwait.exp
View File

@ -22,9 +22,9 @@ shared.2.1
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

4
usr.bin/make/unit-tests/dotwait.mk
View File

@ -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 @@ PAUSE= sleep 1
# 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
#