Module Name: src
Committed By: sjg
Date: Sun Oct 8 20:44:19 UTC 2017
Modified Files:
src/usr.bin/make/unit-tests: dotwait.exp dotwait.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/dotwait.exp \
src/usr.bin/make/unit-tests/dotwait.mk
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/dotwait.exp
diff -u src/usr.bin/make/unit-tests/dotwait.exp:1.1 src/usr.bin/make/unit-tests/dotwait.exp:1.2
--- src/usr.bin/make/unit-tests/dotwait.exp:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/dotwait.exp Sun Oct 8 20:44:19 2017
@@ -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
Index: src/usr.bin/make/unit-tests/dotwait.mk
diff -u src/usr.bin/make/unit-tests/dotwait.mk:1.1 src/usr.bin/make/unit-tests/dotwait.mk:1.2
--- src/usr.bin/make/unit-tests/dotwait.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/dotwait.mk Sun Oct 8 20:44:19 2017
@@ -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
#
