From 5eaa5d75116473501123c7c49a53926e9903ef15 Mon Sep 17 00:00:00 2001
From: mvs <mvs@openbsd.org>
Date: Tue, 14 Dec 2021 15:57:57 +0000
Subject: [PATCH] Move 'unixsock' test from regress/sys/kern/unixsock/ to
 regress/sys/kern/unixsockets/.

ok claudio@
---
 regress/sys/kern/Makefile                                  | 4 ++--
 regress/sys/kern/unixsock/Makefile                         | 5 -----
 regress/sys/kern/unixsockets/Makefile                      | 4 ++--
 regress/sys/kern/{unixsock => unixsockets}/unixsock_test.c | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 regress/sys/kern/unixsock/Makefile
 rename regress/sys/kern/{unixsock => unixsockets}/unixsock_test.c (98%)

diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile
index d3e78b86a16..ef6534c56bf 100644
--- a/regress/sys/kern/Makefile
+++ b/regress/sys/kern/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.101 2021/12/10 00:50:18 mvs Exp $
+#	$OpenBSD: Makefile,v 1.102 2021/12/14 15:57:57 mvs Exp $
 
 SUBDIR+= __syscall
 SUBDIR+= accept access
@@ -23,7 +23,7 @@ SUBDIR+= setuid
 .endif
 SUBDIR+= signal sosplice stackjmp stackpivot syscall syscall_segment
 SUBDIR+= sysvmsg sysvsem sysvshm
-SUBDIR+= unalign unfdpass unixsockets unixsock unveil unveil-unmount
+SUBDIR+= unalign unfdpass unixsockets unveil unveil-unmount
 SUBDIR+= wait
 
 install:
diff --git a/regress/sys/kern/unixsock/Makefile b/regress/sys/kern/unixsock/Makefile
deleted file mode 100644
index 5fd1f468c84..00000000000
--- a/regress/sys/kern/unixsock/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2011/07/05 23:09:16 claudio Exp $
-
-PROG=	unixsock_test
-
-.include <bsd.regress.mk>
diff --git a/regress/sys/kern/unixsockets/Makefile b/regress/sys/kern/unixsockets/Makefile
index 3c308c0b3dc..c39225c2ad5 100644
--- a/regress/sys/kern/unixsockets/Makefile
+++ b/regress/sys/kern/unixsockets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2021/12/10 00:50:18 mvs Exp $
+# $OpenBSD: Makefile,v 1.7 2021/12/14 15:57:57 mvs Exp $
 
 # Copyright (c) 2021 Makkoveev Vitaliy <mvs@openbsd.org>
 #
@@ -16,7 +16,7 @@
 
 WARNINGS = yes
 
-PROGS = undgram_selfconn ungc
+PROGS = undgram_selfconn ungc unixsock_test
 
 PROGS += unconacc
 LDADD_unconacc = -lpthread
diff --git a/regress/sys/kern/unixsock/unixsock_test.c b/regress/sys/kern/unixsockets/unixsock_test.c
similarity index 98%
rename from regress/sys/kern/unixsock/unixsock_test.c
rename to regress/sys/kern/unixsockets/unixsock_test.c
index decbfa92086..b8503a769f4 100644
--- a/regress/sys/kern/unixsock/unixsock_test.c
+++ b/regress/sys/kern/unixsockets/unixsock_test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unixsock_test.c,v 1.3 2017/03/08 19:28:47 deraadt Exp $ */
+/* $OpenBSD: unixsock_test.c,v 1.1 2021/12/14 15:57:57 mvs Exp $ */
 /* Written by Claudio Jeker in 2011 */
 /* Public domain */
 #include <sys/types.h>
-- 
2.20.1