From 4890ac7790c1bddd245cd767a6f09ac3092966a4 Mon Sep 17 00:00:00 2001 From: mvs Date: Thu, 9 Dec 2021 23:37:17 +0000 Subject: [PATCH] Move 'unsendrecvthr' test to regress/sys/kern/unixsockets directory. --- regress/sys/kern/Makefile | 4 ++-- regress/sys/kern/unixsockets/Makefile | 5 ++++- .../unsendrecvthr.c | 2 +- regress/sys/kern/unsendrecvthr/Makefile | 22 ------------------- 4 files changed, 7 insertions(+), 26 deletions(-) rename regress/sys/kern/{unsendrecvthr => unixsockets}/unsendrecvthr.c (98%) delete mode 100644 regress/sys/kern/unsendrecvthr/Makefile diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile index 04d74b11ae0..4d2b0b009ad 100644 --- a/regress/sys/kern/Makefile +++ b/regress/sys/kern/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.98 2021/12/09 23:26:48 mvs Exp $ +# $OpenBSD: Makefile,v 1.99 2021/12/09 23:37:17 mvs Exp $ SUBDIR+= __syscall SUBDIR+= accept access @@ -24,7 +24,7 @@ SUBDIR+= setuid SUBDIR+= signal sosplice stackjmp stackpivot syscall syscall_segment SUBDIR+= sysvmsg sysvsem sysvshm SUBDIR+= unalign unconacc undgram_conclose unfdpass unixsockets -SUBDIR+= unsendrecvthr unixsock unveil unveil-unmount +SUBDIR+= unixsock unveil unveil-unmount SUBDIR+= wait install: diff --git a/regress/sys/kern/unixsockets/Makefile b/regress/sys/kern/unixsockets/Makefile index 336fc2acd23..2e680197b28 100644 --- a/regress/sys/kern/unixsockets/Makefile +++ b/regress/sys/kern/unixsockets/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2021/12/09 23:26:48 mvs Exp $ +# $OpenBSD: Makefile,v 1.4 2021/12/09 23:37:18 mvs Exp $ # Copyright (c) 2021 Makkoveev Vitaliy # @@ -21,6 +21,9 @@ PROGS = undgram_selfconn ungc PROGS += unfdpassfail LDADD_unfdpassfail = -lpthread +PROGS += unsendrecvthr +LDADD_unsendrecvthr = -lpthread + CLEANFILES += *.socket .include diff --git a/regress/sys/kern/unsendrecvthr/unsendrecvthr.c b/regress/sys/kern/unixsockets/unsendrecvthr.c similarity index 98% rename from regress/sys/kern/unsendrecvthr/unsendrecvthr.c rename to regress/sys/kern/unixsockets/unsendrecvthr.c index a56848f5139..9a4f3628755 100644 --- a/regress/sys/kern/unsendrecvthr/unsendrecvthr.c +++ b/regress/sys/kern/unixsockets/unsendrecvthr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unsendrecvthr.c,v 1.2 2021/11/29 21:25:09 mvs Exp $ */ +/* $OpenBSD: unsendrecvthr.c,v 1.1 2021/12/09 23:37:18 mvs Exp $ */ /* * Copyright (c) 2021 Vitaliy Makkoveev diff --git a/regress/sys/kern/unsendrecvthr/Makefile b/regress/sys/kern/unsendrecvthr/Makefile deleted file mode 100644 index 9a808c50cd6..00000000000 --- a/regress/sys/kern/unsendrecvthr/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2021/11/19 17:07:10 mvs Exp $ - -# Copyright (c) 2021 Makkoveev Vitaliy -# -# 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 = unsendrecvthr -LDADD+= -lpthread - -.include -- 2.20.1