From 025de3dcbda8e3569ca07f190d5f4e4402dd5487 Mon Sep 17 00:00:00 2001
From: mvs <mvs@openbsd.org>
Date: Thu, 9 Dec 2021 23:26:48 +0000
Subject: [PATCH] Move 'unfdpassfail' test to regress/sys/kern/unixsockets/
 directory.

---
 regress/sys/kern/Makefile                           |  6 +++---
 regress/sys/kern/unfdpassfail/Makefile              | 13 -------------
 regress/sys/kern/unixsockets/Makefile               |  5 ++++-
 .../{unfdpassfail => unixsockets}/unfdpassfail.c    |  2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 regress/sys/kern/unfdpassfail/Makefile
 rename regress/sys/kern/{unfdpassfail => unixsockets}/unfdpassfail.c (97%)

diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile
index d554a2914c3..04d74b11ae0 100644
--- a/regress/sys/kern/Makefile
+++ b/regress/sys/kern/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.97 2021/12/09 17:41:51 mvs Exp $
+#	$OpenBSD: Makefile,v 1.98 2021/12/09 23:26:48 mvs Exp $
 
 SUBDIR+= __syscall
 SUBDIR+= accept access
@@ -23,8 +23,8 @@ SUBDIR+= setuid
 .endif
 SUBDIR+= signal sosplice stackjmp stackpivot syscall syscall_segment
 SUBDIR+= sysvmsg sysvsem sysvshm
-SUBDIR+= unalign unconacc undgram_conclose unfdpass unfdpassfail
-SUBDIR+= unixsockets unsendrecvthr unixsock unveil unveil-unmount
+SUBDIR+= unalign unconacc undgram_conclose unfdpass unixsockets 
+SUBDIR+= unsendrecvthr unixsock unveil unveil-unmount
 SUBDIR+= wait
 
 install:
diff --git a/regress/sys/kern/unfdpassfail/Makefile b/regress/sys/kern/unfdpassfail/Makefile
deleted file mode 100644
index ac1e649b5b4..00000000000
--- a/regress/sys/kern/unfdpassfail/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2021/05/27 20:23:53 mvs Exp $
-
-#
-# This test enforces unp_internalize() to follow error path because
-# we pass kqueue(2) descriptor. We have concurrent thread which closes
-# socket descriptor passed to socket and if we are lucky this triggers
-# FRELE(9).
-#
-
-PROG= unfdpassfail
-LDFLAGS= -lpthread
-
-.include <bsd.regress.mk>
diff --git a/regress/sys/kern/unixsockets/Makefile b/regress/sys/kern/unixsockets/Makefile
index 99f6214af58..336fc2acd23 100644
--- a/regress/sys/kern/unixsockets/Makefile
+++ b/regress/sys/kern/unixsockets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2021/12/09 17:41:51 mvs Exp $
+# $OpenBSD: Makefile,v 1.3 2021/12/09 23:26:48 mvs Exp $
 
 # Copyright (c) 2021 Makkoveev Vitaliy <mvs@openbsd.org>
 #
@@ -18,6 +18,9 @@ WARNINGS = yes
 
 PROGS = undgram_selfconn ungc
 
+PROGS += unfdpassfail
+LDADD_unfdpassfail = -lpthread
+
 CLEANFILES += *.socket
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/unfdpassfail/unfdpassfail.c b/regress/sys/kern/unixsockets/unfdpassfail.c
similarity index 97%
rename from regress/sys/kern/unfdpassfail/unfdpassfail.c
rename to regress/sys/kern/unixsockets/unfdpassfail.c
index 2df68bff7d6..49fa0774087 100644
--- a/regress/sys/kern/unfdpassfail/unfdpassfail.c
+++ b/regress/sys/kern/unixsockets/unfdpassfail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unfdpassfail.c,v 1.1 2021/05/27 20:23:53 mvs Exp $ */
+/* $OpenBSD: unfdpassfail.c,v 1.1 2021/12/09 23:26:48 mvs Exp $ */
 
 /*
  * Copyright (c) 2021 Vitaliy Makkoveev <mvs@openbsd.org>
-- 
2.20.1