Module Name: src
Committed By: jmmv
Date: Sat Aug 25 22:21:16 UTC 2012
Modified Files:
src/share/mk: bsd.test.mk
Log Message:
Fix "make test" to actually print the desired message when atf-run fails.
It was being skipped due to the set -e in the code snippet and the failure
to properly capture atf-run's exit code.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.20 src/share/mk/bsd.test.mk:1.21
--- src/share/mk/bsd.test.mk:1.20 Fri Aug 24 20:28:19 2012
+++ src/share/mk/bsd.test.mk Sat Aug 25 22:21:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.20 2012/08/24 20:28:19 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.21 2012/08/25 22:21:16 jmmv Exp $
#
.include <bsd.init.mk>
@@ -139,8 +139,8 @@ test:
mkfifo ${_TESTS_FIFO}; \
cat ${_TESTS_FIFO} | tee ${_TESTS_LOG} | \
${TESTS_ENV} ${DESTDIR}/usr/bin/atf-report & \
- ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-run >>${_TESTS_FIFO}; \
- result=$${?}; \
+ result=0; \
+ ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-run >>${_TESTS_FIFO} || result=1; \
wait; \
rm -f ${_TESTS_FIFO}; \
echo; \
