From 8f65ac5eb5e061986e0f17fc997f0185225a70ee Mon Sep 17 00:00:00 2001
From: mvs <mvs@openbsd.org>
Date: Fri, 10 Dec 2021 00:33:25 +0000
Subject: [PATCH] Move 'undgram_conclose' test to regress/sys/kern/unixsockets
 directory.

---
 regress/sys/kern/Makefile                     |  5 ++--
 regress/sys/kern/undgram_conclose/Makefile    | 24 -------------------
 regress/sys/kern/unixsockets/Makefile         |  5 +++-
 .../undgram_conclose.c                        |  2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 regress/sys/kern/undgram_conclose/Makefile
 rename regress/sys/kern/{undgram_conclose => unixsockets}/undgram_conclose.c (98%)

diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile
index 4d2b0b009ad..0de4efc41fc 100644
--- a/regress/sys/kern/Makefile
+++ b/regress/sys/kern/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.99 2021/12/09 23:37:17 mvs Exp $
+#	$OpenBSD: Makefile,v 1.100 2021/12/10 00:33:25 mvs Exp $
 
 SUBDIR+= __syscall
 SUBDIR+= accept access
@@ -23,8 +23,7 @@ SUBDIR+= setuid
 .endif
 SUBDIR+= signal sosplice stackjmp stackpivot syscall syscall_segment
 SUBDIR+= sysvmsg sysvsem sysvshm
-SUBDIR+= unalign unconacc undgram_conclose unfdpass unixsockets 
-SUBDIR+= unixsock unveil unveil-unmount
+SUBDIR+= unalign unconacc unfdpass unixsockets unixsock unveil unveil-unmount
 SUBDIR+= wait
 
 install:
diff --git a/regress/sys/kern/undgram_conclose/Makefile b/regress/sys/kern/undgram_conclose/Makefile
deleted file mode 100644
index 5d0bcb6e18a..00000000000
--- a/regress/sys/kern/undgram_conclose/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2021/11/29 21:21:26 mvs Exp $
-
-# Copyright (c) 2021 Makkoveev Vitaliy <mvs@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
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-WARNINGS = yes
-
-PROG = undgram_conclose
-LDADD+= -lpthread
-
-CLEANFILES += undgram_conclose.socket
-
-.include <bsd.regress.mk>
diff --git a/regress/sys/kern/unixsockets/Makefile b/regress/sys/kern/unixsockets/Makefile
index 2e680197b28..3895d1e761f 100644
--- a/regress/sys/kern/unixsockets/Makefile
+++ b/regress/sys/kern/unixsockets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2021/12/09 23:37:18 mvs Exp $
+# $OpenBSD: Makefile,v 1.5 2021/12/10 00:33:25 mvs Exp $
 
 # Copyright (c) 2021 Makkoveev Vitaliy <mvs@openbsd.org>
 #
@@ -18,6 +18,9 @@ WARNINGS = yes
 
 PROGS = undgram_selfconn ungc
 
+PROGS += undgram_conclose
+LDADD_undgram_conclose = -lpthread
+
 PROGS += unfdpassfail
 LDADD_unfdpassfail = -lpthread
 
diff --git a/regress/sys/kern/undgram_conclose/undgram_conclose.c b/regress/sys/kern/unixsockets/undgram_conclose.c
similarity index 98%
rename from regress/sys/kern/undgram_conclose/undgram_conclose.c
rename to regress/sys/kern/unixsockets/undgram_conclose.c
index 8f5415905f1..6108c8be188 100644
--- a/regress/sys/kern/undgram_conclose/undgram_conclose.c
+++ b/regress/sys/kern/unixsockets/undgram_conclose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: undgram_conclose.c,v 1.4 2021/12/01 10:24:40 mvs Exp $ */
+/* $OpenBSD: undgram_conclose.c,v 1.1 2021/12/10 00:33:25 mvs Exp $ */
 
 /*
  * Copyright (c) 2021 Vitaliy Makkoveev <mvs@openbsd.org>
-- 
2.20.1