Remove the REGRESS_MAXTIME feature from regress framework. The

timeout based on CPU seconds is pretty useless, most hanging tests
sleep and do not spin.  The timeout could not be distinguished from
failure.  Only 3 tests used it.
OK anton@ schwarze@ cheloha@ otto@

5 files changed, 11 insertions, 37 deletions

diff --git a/regress/lib/libpthread/Makefile.inc b/regress/lib/libpthread/Makefile.inc
index 2e2516fd646..ece53f852bd 100644
--- a/regress/lib/libpthread/Makefile.inc
+++ b/regress/lib/libpthread/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2012/08/19 18:55:16 fgsch Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2019/05/14 16:43:26 bluhm Exp $
 # Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
 
 LIBPTHREAD=	/usr/lib/libpthread.a
@@ -10,5 +10,3 @@ CFLAGS+=	-Wall # -Werror
 #DEBUG=		-ggdb
 CFLAGS+=	-DSRCDIR='"${.CURDIR}"'
 CFLAGS+=	-I${.CURDIR}/../include
-
-REGRESS_MAXTIME?=30
diff --git a/regress/lib/libpthread/pthread_specific/Makefile b/regress/lib/libpthread/pthread_specific/Makefile
index b4bd9b52b2c..67c02e4ff8b 100644
--- a/regress/lib/libpthread/pthread_specific/Makefile
+++ b/regress/lib/libpthread/pthread_specific/Makefile
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2013/12/22 11:08:31 kettenis Exp $
+# $OpenBSD: Makefile,v 1.3 2019/05/14 16:43:26 bluhm Exp $
 
 PROG=	pthread_specific
 
-REGRESS_MAXTIME=60
-
 .include <bsd.regress.mk>
diff --git a/regress/lib/libpthread/stdarg/Makefile b/regress/lib/libpthread/stdarg/Makefile
index b2fe241a858..547e26115df 100644
--- a/regress/lib/libpthread/stdarg/Makefile
+++ b/regress/lib/libpthread/stdarg/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2013/12/26 16:22:55 kettenis Exp $
+# $OpenBSD: Makefile,v 1.6 2019/05/14 16:43:26 bluhm Exp $
 
 PROG=	stdarg
 
 CFLAGS+= -I${.CURDIR}/../include
 
-REGRESS_MAXTIME=10
-
 .include <bsd.regress.mk>
diff --git a/share/man/man5/bsd.regress.mk.5 b/share/man/man5/bsd.regress.mk.5
index ea37caddcda..ed0615792fb 100644
--- a/share/man/man5/bsd.regress.mk.5
+++ b/share/man/man5/bsd.regress.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.regress.mk.5,v 1.18 2018/12/02 11:46:31 anton Exp $
+.\" $OpenBSD: bsd.regress.mk.5,v 1.19 2019/05/14 16:43:26 bluhm Exp $
 .\"
 .\" Copyright (c) 2002 Anil Madhavapeddy
 .\" Copyright (c) 2000 Marc Espie
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 2 2018 $
+.Dd $Mdocdate: May 14 2019 $
 .Dt BSD.REGRESS.MK 5
 .Os
 .Sh NAME
@@ -80,9 +80,6 @@ Points to the fully-qualified path of a file to which regression
 results are appended.
 Defaults to
 .Pa /dev/null .
-.It Ev REGRESS_MAXTIME
-Maximum limit of CPU seconds to spend on the regression test.
-Exceeding this time will result in a failure being logged.
 .It Ev REGRESS_ROOT_TARGETS
 Targets for which root access is required to run the test.
 The
@@ -216,7 +213,3 @@ since.
 The current Makefile framework was written by Artur Grabowski
 and Marc Espie for
 .Ox 3.1 .
-.Sh BUGS AND LIMITATIONS
-The build system is unable to distinguish between timeouts due to
-.Ev REGRESS_MAXTIME
-being exceeded, or a genuine failure occurring.
diff --git a/share/mk/bsd.regress.mk b/share/mk/bsd.regress.mk
index 8cdac28484c..084e4b3ad80 100644
--- a/share/mk/bsd.regress.mk
+++ b/share/mk/bsd.regress.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.regress.mk,v 1.17 2018/12/03 22:30:04 bluhm Exp $
+# $OpenBSD: bsd.regress.mk,v 1.18 2019/05/14 16:43:26 bluhm Exp $
 # Documented in bsd.regress.mk(5)
 
 # No man pages for regression tests.
@@ -39,14 +39,14 @@ REGRESS_SKIP_TARGETS=run-regress-${PROG}
 .  endif
 .endif
 
-.if defined(REGRESS_SLOW_TARGETS) && ${REGRESS_SKIP_SLOW} != no
+.if defined(REGRESS_SLOW_TARGETS) && ${REGRESS_SKIP_SLOW:L} != no
 REGRESS_SKIP_TARGETS+=${REGRESS_SLOW_TARGETS}
 .endif
 
-.if ${REGRESS_FAIL_EARLY} != no
-_SKIP_FAIL=
+.if ${REGRESS_FAIL_EARLY:L} != no
+_REGRESS_IGNORE_FAIL=
 .else
-_SKIP_FAIL=-
+_REGRESS_IGNORE_FAIL=	-
 .endif
 
 .if defined(REGRESS_ROOT_TARGETS)
@@ -102,26 +102,13 @@ regress: .SILENT
 	@echo -n "SKIP " ${_REGRESS_OUT}
 	@echo SKIPPED
 .  else
-# XXX - we need a better method to see if a test fails due to timeout or just
-#       normal failure.
-.   if !defined(REGRESS_MAXTIME)
-	${_SKIP_FAIL}if cd ${.CURDIR} && ${MAKE} ${RT}; then \
+	${_REGRESS_IGNORE_FAIL} if ${MAKE} -C ${.CURDIR} ${RT}; then \
 	    echo -n "SUCCESS " ${_REGRESS_OUT} ; \
 	else \
 	    echo -n "FAIL " ${_REGRESS_OUT} ; \
 	    echo FAILED ; \
 	    false; \
 	fi
-.   else
-	${_SKIP_FAIL}if cd ${.CURDIR} && \
-	    (ulimit -t ${REGRESS_MAXTIME} ; ${MAKE} ${RT}); then \
-	    echo -n "SUCCESS " ${_REGRESS_OUT} ; \
-	else \
-	    echo -n "FAIL (possible timeout) " ${_REGRESS_OUT} ; \
-	    echo FAILED ; \
-	    false; \
-	fi
-.   endif
 .  endif
 	@echo ${_REGRESS_NAME}/${RT:S/^run-regress-//} ${_REGRESS_OUT}
 .endfor