[pkgsrc/trunk]: pkgsrc/regress Don't die as soon as the first test fails. In...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0436aa817103
branches:  trunk
changeset: 480040:0436aa817103
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 28 21:21:12 2004 +0000

description:
Don't die as soon as the first test fails.  Instead, run them all,
then report how many failed and which ones.  Return with an exit code
indicating how many tests failed.

diffstat:

 regress/buildlink-transform/Makefile |  20 ++++++++++++++------
 regress/buildlink-unwrap/Makefile    |  16 +++++++++++++---
 2 files changed, 27 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 27bace5d16b6 -r 0436aa817103 regress/buildlink-transform/Makefile
--- a/regress/buildlink-transform/Makefile      Sat Aug 28 21:09:08 2004 +0000
+++ b/regress/buildlink-transform/Makefile      Sat Aug 28 21:21:12 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/08/28 08:20:44 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/28 21:21:12 jlam Exp $
 #
 # Run many buildlink transform tests in a single regression test to avoid
 # having to keep creating the wrapper scripts over and over again.
@@ -51,12 +51,20 @@
 
 .PHONY: regress do-regress
 
-regress: ${WRAPPER_PHASE}
-       @cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-regress               \
-               PKG_PHASE=${WRAPPER_PHASE}
+regress: ${WRAPPER_PHASE} do-regress
+
+FAILED_TESTS=  ${WRKDIR}/failed
 
 do-regress:
-       @${DO_NADA}
+       @if [ -f ${FAILED_TESTS} ]; then                                \
+               ${ECHO} "FAILED:";                                      \
+               ${CAT} ${FAILED_TESTS} | while read test; do            \
+                       ${ECHO} "       $$test";                        \
+               done;                                                   \
+               exit `${CAT} ${FAILED_TESTS} | ${WC} -l`;               \
+       else                                                            \
+               ${DO_NADA};                                             \
+       fi
 
 TEST_RESULT=   runtest=`${SETENV} ${REGRESS_ENV} regress $$test`;      \
                ${ECHO} "(${.TARGET}) saw:      $$test";                \
@@ -68,7 +76,7 @@
                        ;;                                              \
                *)                                                      \
                        ${ECHO} "(${.TARGET}) result:   FAIL";          \
-                       exit 1;                                         \
+                       ${ECHO} "${.TARGET}" >> ${FAILED_TESTS};        \
                        ;;                                              \
                esac
 
diff -r 27bace5d16b6 -r 0436aa817103 regress/buildlink-unwrap/Makefile
--- a/regress/buildlink-unwrap/Makefile Sat Aug 28 21:09:08 2004 +0000
+++ b/regress/buildlink-unwrap/Makefile Sat Aug 28 21:21:12 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/28 06:17:21 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/08/28 21:21:12 jlam Exp $
 
 DISTNAME=      regress-buildlink-unwrap-0.0
 CATEGORIES=    regress
@@ -39,8 +39,18 @@
 
 regress: build do-regress
 
+FAILED_TESTS=  ${WRKDIR}/failed
+
 do-regress:
-       @${DO_NADA}
+       @if [ -f ${FAILED_TESTS} ]; then                                \
+               ${ECHO} "FAILED:";                                      \
+               ${CAT} ${FAILED_TESTS} | while read test; do            \
+                       ${ECHO} "       $$test";                        \
+               done;                                                   \
+               exit `${CAT} ${FAILED_TESTS} | ${WC} -l`;               \
+       else                                                            \
+               ${DO_NADA};                                             \
+       fi
 
 TEST_RESULT=   PATH="${WRKSRC}:${PATH}";                               \
                runtest=`$$test`;                                       \
@@ -53,7 +63,7 @@
                        ;;                                              \
                *)                                                      \
                        ${ECHO} "(${.TARGET}) result:   FAIL";          \
-                       exit 1;                                         \
+                       ${ECHO} "${.TARGET}" >> ${FAILED_TESTS};        \
                        ;;                                              \
                esac