Skip tests that use too many resources on armv7.

3 files changed, 17 insertions, 10 deletions

diff --git a/regress/sys/netinet/bindconnect/Makefile b/regress/sys/netinet/bindconnect/Makefile
index 50e126121c7..3d18fe6dde9 100644
--- a/regress/sys/netinet/bindconnect/Makefile
+++ b/regress/sys/netinet/bindconnect/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2024/01/02 15:06:48 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.5 2024/01/04 00:19:17 bluhm Exp $
 
 PROG=		bindconnect
 LDADD=		-lpthread
@@ -10,6 +10,7 @@ CLEANFILES=	ktrace.out
 LOCAL_NET ?=
 LOCAL_NET6 ?=
 
+REGRESS_ROOT_TARGETS +=	setup-maxfiles
 REGRESS_SETUP_ONCE +=	setup-maxfiles
 setup-maxfiles:
 	[[ $$(sysctl -n kern.maxfiles) -ge 110000 ]] || \
@@ -56,6 +57,11 @@ run-${af}-${proto}-bind-connect:
 	${SUDO_${proto}} time ${KTRACE} ./${PROG} \
 	    -f ${af} -p ${proto} -n 16 -s 2 -o 1 -b 3 -c 3
 
+# skip test on armv7, it fails with malloc: out of space in kmem_map
+.if "${MACHINE}" == armv7
+REGRESS_SKIP_TARGETS +=	run-${af}-${proto}-100000
+.endif
+REGRESS_ROOT_TARGETS +=	run-${af}-${proto}-100000
 REGRESS_TARGETS +=	run-${af}-${proto}-100000
 run-${af}-${proto}-100000:
 	${SUDO} time ${KTRACE} ./${PROG} \
@@ -82,6 +88,7 @@ run-${af}-${proto}-localnet-bind-connect:
 	${SUDO_${proto}} time ${KTRACE} ./${PROG} \
 	    -f ${af} -p ${proto} -n 16 -s 2 -o 1 -b 3 -c 3 -N ${NET_${af}}
 
+REGRESS_ROOT_TARGETS +=	run-${af}-${proto}-localnet-connect-delete
 REGRESS_TARGETS +=	run-${af}-${proto}-localnet-connect-delete
 run-${af}-${proto}-localnet-connect-delete:
 	${SUDO} time ${KTRACE} ./${PROG} \
@@ -90,7 +97,6 @@ run-${af}-${proto}-localnet-connect-delete:
 .endfor
 .endfor
 
-REGRESS_ROOT_TARGETS +=	setup-maxfiles run-100000 run-localnet-connect-delete
-REGRESS_ROOT_TARGETS +=	${REGRESS_TARGETS:N*-udp-*:N*-tcp-*}
+REGRESS_ROOT_TARGETS +=	${REGRESS_TARGETS:M*-any-*}
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/netinet/bindconnect/README b/regress/sys/netinet/bindconnect/README
index f4259087738..a3acfc4d6e5 100644
--- a/regress/sys/netinet/bindconnect/README
+++ b/regress/sys/netinet/bindconnect/README
@@ -1,7 +1,7 @@
 Stress test bind(2) and connect(2) system calls in OpenBSD regress.
 
-bindconnect [-r] [-b bind] [-c connect] [-d delroute]
-[-N addr/net] [-n num] [-o close] [-s socket] [-t time]
+bindconnect [-r] [-b bind] [-c connect] [-d delroute] [-f family] [-N addr/net]
+[-n num] [-o close] [-p proto] [-s socket] [-t time]
     -b bind      threads binding sockets, default 1
     -c connect   threads connecting sockets, default 1
     -d delroute  threads deleting cloned routes, default 0
@@ -9,6 +9,7 @@ bindconnect [-r] [-b bind] [-c connect] [-d delroute]
     -N addr/net  connect to any address within network
     -n num       number of file descriptors, default 128
     -o close     threads closing sockets, default 1
+    -p proto     protocol udp, tcp, name or number, default udp
     -r           set reuse port socket option
     -s socket    threads creating sockets, default 1
     -t time      run time in seconds, default 10
diff --git a/regress/sys/netinet/bindconnect/bindconnect.c b/regress/sys/netinet/bindconnect/bindconnect.c
index f2830e91d29..f32b85c6039 100644
--- a/regress/sys/netinet/bindconnect/bindconnect.c
+++ b/regress/sys/netinet/bindconnect/bindconnect.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: bindconnect.c,v 1.4 2024/01/02 15:06:48 bluhm Exp $	*/
+/*	$OpenBSD: bindconnect.c,v 1.5 2024/01/04 00:19:17 bluhm Exp $	*/
 
 /*
- * Copyright (c) 2023 Alexander Bluhm <bluhm@openbsd.org>
+ * Copyright (c) 2023-2024 Alexander Bluhm <bluhm@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -62,9 +62,9 @@ static void __dead
 usage(void)
 {
 	fprintf(stderr,
-	    "bindconnect [-r] [-b bind] [-c connect] [-d delroute]\n"
-	    "[-f family] [-N addr/net] [-n num] [-o close] [-s socket]\n"
-	    "[-t time]\n"
+	    "bindconnect [-r] [-b bind] [-c connect] [-d delroute] "
+	    "[-f family] [-N addr/net] [-n num] [-o close] [-p proto] "
+	    "[-s socket] [-t time]\n"
 	    "    -b bind      threads binding sockets, default %u\n"
 	    "    -c connect   threads connecting sockets, default %u\n"
 	    "    -d delroute  threads deleting cloned routes, default %u\n"