Move 'unconacc' test to regress/sys/kern/unixsockets/ directory.

4 files changed, 7 insertions, 28 deletions

diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile
index 0de4efc41fc..d3e78b86a16 100644
--- a/regress/sys/kern/Makefile
+++ b/regress/sys/kern/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.100 2021/12/10 00:33:25 mvs Exp $
+#	$OpenBSD: Makefile,v 1.101 2021/12/10 00:50:18 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 unconacc unfdpass unixsockets unixsock unveil unveil-unmount
+SUBDIR+= unalign unfdpass unixsockets unixsock unveil unveil-unmount
 SUBDIR+= wait
 
 install:
diff --git a/regress/sys/kern/unconacc/Makefile b/regress/sys/kern/unconacc/Makefile
deleted file mode 100644
index d945c71a169..00000000000
--- a/regress/sys/kern/unconacc/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 = unconacc
-LDADD+= -lpthread
-
-CLEANFILES += unconacc.socket
-
-.include <bsd.regress.mk>
diff --git a/regress/sys/kern/unixsockets/Makefile b/regress/sys/kern/unixsockets/Makefile
index 3895d1e761f..3c308c0b3dc 100644
--- a/regress/sys/kern/unixsockets/Makefile
+++ b/regress/sys/kern/unixsockets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2021/12/10 00:33:25 mvs Exp $
+# $OpenBSD: Makefile,v 1.6 2021/12/10 00:50:18 mvs Exp $
 
 # Copyright (c) 2021 Makkoveev Vitaliy <mvs@openbsd.org>
 #
@@ -18,6 +18,9 @@ WARNINGS = yes
 
 PROGS = undgram_selfconn ungc
 
+PROGS += unconacc
+LDADD_unconacc = -lpthread
+
 PROGS += undgram_conclose
 LDADD_undgram_conclose = -lpthread
 
diff --git a/regress/sys/kern/unconacc/unconacc.c b/regress/sys/kern/unixsockets/unconacc.c
index 52ca734e192..bb298fdb2ad 100644
--- a/regress/sys/kern/unconacc/unconacc.c
+++ b/regress/sys/kern/unixsockets/unconacc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unconacc.c,v 1.4 2021/12/01 10:24:40 mvs Exp $ */
+/* $OpenBSD: unconacc.c,v 1.1 2021/12/10 00:50:18 mvs Exp $ */
 
 /*
  * Copyright (c) 2021 Vitaliy Makkoveev <mvs@openbsd.org>