Adjust wait channel name and re-enable test.

diff --git a/regress/sys/kern/poll/Makefile b/regress/sys/kern/poll/Makefile
index 3bbaad3..d0e39c0 100644 (file)
--- a/regress/sys/kern/poll/Makefile
+++ b/regress/sys/kern/poll/Makefile
@@ -1,11 +1,7 @@
-#      $OpenBSD: Makefile,v 1.4 2021/11/24 12:58:01 visa Exp $
+#      $OpenBSD: Makefile,v 1.5 2021/11/27 15:07:26 visa Exp $
 
 PROGS=         poll_close pollnval pollretval
 LDADD=         -lpthread
 WARNINGS=      yes
 
-run-regress-poll_close:
-       # Disabled until poll(2) uses kqueue as backend.
-       @echo DISABLED
-
 .include <bsd.regress.mk>

diff --git a/regress/sys/kern/poll/poll_close.c b/regress/sys/kern/poll/poll_close.c
index e8dd868..2784a43 100644 (file)
--- a/regress/sys/kern/poll/poll_close.c
+++ b/regress/sys/kern/poll/poll_close.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: poll_close.c,v 1.2 2021/11/27 15:06:10 visa Exp $     */
+/*     $OpenBSD: poll_close.c,v 1.3 2021/11/27 15:07:26 visa Exp $     */
 
 /*
  * Copyright (c) 2021 Visa Hankala
@@ -132,7 +132,7 @@ main(void)
        }
 
        /* Let the thread settle in poll(). */
-       wait_wchan("kqread");
+       wait_wchan("poll");
 
        /* Awaken poll(). */
        write(sock[0], "x", 1);
@@ -153,7 +153,7 @@ main(void)
        write(barrier[0], "x", 1);
 
        /* Let the thread settle in poll(). */
-       wait_wchan("kqread");
+       wait_wchan("poll");
 
        /* Close the fd to awaken poll(). */
        close(sock[1]);