Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Fix "make test" to actually print the desired messa...



details:   https://anonhg.NetBSD.org/src/rev/390c481e94b1
branches:  trunk
changeset: 781191:390c481e94b1
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Aug 25 22:21:16 2012 +0000

description:
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.

diffstat:

 share/mk/bsd.test.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 6fde16fa65ec -r 390c481e94b1 share/mk/bsd.test.mk
--- a/share/mk/bsd.test.mk      Sat Aug 25 18:00:06 2012 +0000
+++ b/share/mk/bsd.test.mk      Sat Aug 25 22:21:16 2012 +0000
@@ -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 @@
        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; \



Home | Main Index | Thread Index | Old Index