55 files changed, 57 insertions, 235 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 35e1c06..64ea032 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -392,6 +392,8 @@
             unlink
             ..
         ..
+        socket
+        ..
     ..
     usr.bin
         apply
diff --git a/tests/sys/sockets/Makefile b/tests/sys/sockets/Makefile
new file mode 100644
index 0000000..ac18a8e
--- /dev/null
+++ b/tests/sys/sockets/Makefile
@@ -0,0 +1,54 @@
+# $FreeBSD$
+#
+# Some of these tests fail on 11.0-CURRENT @ r280355 with DEBUG bits on
+
+TESTSDIR=	${TESTSBASE}/sys/socket
+
+BINDIR=		${TESTSDIR}
+
+PROGS+=		unix_cmsg
+
+TAP_TESTS_C+=	accept_fd_leak_test
+# accf_data_attach: not ok 9 - setsockopt() after listen() failed with 2 (No such file or directory)
+TAP_TESTS_C+=	accf_data_attach_test
+PLAIN_TESTS_C+=	fstat_test
+PLAIN_TESTS_C+=	kqueue_test
+PLAIN_TESTS_C+=	listen_backlog_test
+PLAIN_TESTS_C+=	listenclose_test
+PLAIN_TESTS_C+=	pr_atomic_test
+PLAIN_TESTS_C+=	reconnect_test
+# rtsocket: socket(PF_ROUTE, SOCK_STREAM, 0): Protocol wrong type for socket
+PLAIN_TESTS_C+=	rtsocket_test
+PLAIN_TESTS_C+=	sblock_test
+TAP_TESTS_C+=	sendfile_test
+PLAIN_TESTS_C+=	shutdown_test
+PLAIN_TESTS_C+=	sigpipe_test
+TAP_TESTS_C+=	so_setfib_test
+PLAIN_TESTS_C+=	socketpair_test
+PLAIN_TESTS_C+=	unix_bindconnect_test
+PLAIN_TESTS_C+=	unix_close_race_test
+# Lots of failures
+TAP_TESTS_SH+=	unix_cmsg_test
+# unix_gc: twosome_drop1: sendfd: before 0 after 0
+PLAIN_TESTS_C+=	unix_gc_test
+# unix_passfd: test8-rights+creds+payload: recvmsg: 24 bytes received
+PLAIN_TESTS_C+=	unix_passfd_test
+PLAIN_TESTS_C+=	unix_sendtorace_test
+# unix_socket: socket(PF_LOCAL, SOCK_RAW, 0): Protocol wrong type for socket
+PLAIN_TESTS_C+=	unix_socket_test
+PLAIN_TESTS_C+=	unix_sorflush_test
+# zerosend: tcp_0write: bind(127.0.0.1, 10001): Address already in use
+PLAIN_TESTS_C+=	zerosend_test
+
+DPADD.sendfile_test+=	${LIBMD}
+LDADD.sendfile_test+=	-lmd
+
+# XXX: this doesn't work..?
+#WARNS.unix_cmsg=	3
+#WARNS.unix_gc=		3
+#WARNS.unix_passfd=	3
+#WARNS.zerosend=		2
+
+WARNS=	2
+
+.include <bsd.test.mk>
diff --git a/tools/regression/sockets/unix_cmsg/README b/tests/sys/sockets/README.unix_cmsg
index df51723..df51723 100644
--- a/tools/regression/sockets/unix_cmsg/README
+++ b/tests/sys/sockets/README.unix_cmsg
diff --git a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c b/tests/sys/sockets/accept_fd_leak_test.c
index 659c22d..659c22d 100644
--- a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
+++ b/tests/sys/sockets/accept_fd_leak_test.c
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.c b/tests/sys/sockets/accf_data_attach_test.c
index 59ea68c..59ea68c 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.c
+++ b/tests/sys/sockets/accf_data_attach_test.c
diff --git a/tools/regression/sockets/fstat/fstat.c b/tests/sys/sockets/fstat_test.c
index 6ea931d..6ea931d 100644
--- a/tools/regression/sockets/fstat/fstat.c
+++ b/tests/sys/sockets/fstat_test.c
diff --git a/tools/regression/sockets/kqueue/kqueue.c b/tests/sys/sockets/kqueue_test.c
index f73704a..f73704a 100644
--- a/tools/regression/sockets/kqueue/kqueue.c
+++ b/tests/sys/sockets/kqueue_test.c
diff --git a/tools/regression/sockets/listen_backlog/listen_backlog.c b/tests/sys/sockets/listen_backlog_test.c
index 2276393..2276393 100644
--- a/tools/regression/sockets/listen_backlog/listen_backlog.c
+++ b/tests/sys/sockets/listen_backlog_test.c
diff --git a/tools/regression/sockets/listenclose/listenclose.c b/tests/sys/sockets/listenclose_test.c
index f920846..f920846 100644
--- a/tools/regression/sockets/listenclose/listenclose.c
+++ b/tests/sys/sockets/listenclose_test.c
diff --git a/tools/regression/sockets/pr_atomic/pr_atomic.c b/tests/sys/sockets/pr_atomic_test.c
index e902cf7..e902cf7 100644
--- a/tools/regression/sockets/pr_atomic/pr_atomic.c
+++ b/tests/sys/sockets/pr_atomic_test.c
diff --git a/tools/regression/sockets/reconnect/reconnect.c b/tests/sys/sockets/reconnect_test.c
index 27f32cc..27f32cc 100644
--- a/tools/regression/sockets/reconnect/reconnect.c
+++ b/tests/sys/sockets/reconnect_test.c
diff --git a/tools/regression/sockets/rtsocket/rtsocket.c b/tests/sys/sockets/rtsocket_test.c
index b5824b3..b5824b3 100644
--- a/tools/regression/sockets/rtsocket/rtsocket.c
+++ b/tests/sys/sockets/rtsocket_test.c
diff --git a/tools/regression/sockets/sblock/sblock.c b/tests/sys/sockets/sblock_test.c
index 415c4d4..415c4d4 100644
--- a/tools/regression/sockets/sblock/sblock.c
+++ b/tests/sys/sockets/sblock_test.c
diff --git a/tools/regression/sockets/sendfile/sendfile.c b/tests/sys/sockets/sendfile_test.c
index 18ae9ad..18ae9ad 100644
--- a/tools/regression/sockets/sendfile/sendfile.c
+++ b/tests/sys/sockets/sendfile_test.c
diff --git a/tools/regression/sockets/shutdown/shutdown.c b/tests/sys/sockets/shutdown_test.c
index 3d23c94..3d23c94 100644
--- a/tools/regression/sockets/shutdown/shutdown.c
+++ b/tests/sys/sockets/shutdown_test.c
diff --git a/tools/regression/sockets/sigpipe/sigpipe.c b/tests/sys/sockets/sigpipe_test.c
index 894d9de..894d9de 100644
--- a/tools/regression/sockets/sigpipe/sigpipe.c
+++ b/tests/sys/sockets/sigpipe_test.c
diff --git a/tools/regression/sockets/so_setfib/so_setfib.c b/tests/sys/sockets/so_setfib_test.c
index 50cb020..50cb020 100644
--- a/tools/regression/sockets/so_setfib/so_setfib.c
+++ b/tests/sys/sockets/so_setfib_test.c
diff --git a/tools/regression/sockets/socketpair/socketpair.c b/tests/sys/sockets/socketpair_test.c
index 779878a..779878a 100644
--- a/tools/regression/sockets/socketpair/socketpair.c
+++ b/tests/sys/sockets/socketpair_test.c
diff --git a/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c b/tests/sys/sockets/unix_bindconnect_test.c
index 079dc4d..079dc4d 100644
--- a/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
+++ b/tests/sys/sockets/unix_bindconnect_test.c
diff --git a/tools/regression/sockets/unix_close_race/unix_close_race.c b/tests/sys/sockets/unix_close_race_test.c
index 89c1b20..89c1b20 100644
--- a/tools/regression/sockets/unix_close_race/unix_close_race.c
+++ b/tests/sys/sockets/unix_close_race_test.c
diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.c b/tests/sys/sockets/unix_cmsg.c
index d91cef4..d91cef4 100644
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.c
+++ b/tests/sys/sockets/unix_cmsg.c
diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.t b/tests/sys/sockets/unix_cmsg_test.sh
index 70d9277..c4a0b34 100644
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.t
+++ b/tests/sys/sockets/unix_cmsg_test.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-cmd="./`basename $0 .t`"
-
-make ${cmd} >/dev/null 2>&1
+cmd=`echo $0 | sed -e 's,_test$,,'`
 
 IFS=
 n=0
diff --git a/tools/regression/sockets/unix_gc/unix_gc.c b/tests/sys/sockets/unix_gc_test.c
index 8cae2d9..8cae2d9 100644
--- a/tools/regression/sockets/unix_gc/unix_gc.c
+++ b/tests/sys/sockets/unix_gc_test.c
diff --git a/tools/regression/sockets/unix_passfd/unix_passfd.c b/tests/sys/sockets/unix_passfd_test.c
index 07ef589..07ef589 100644
--- a/tools/regression/sockets/unix_passfd/unix_passfd.c
+++ b/tests/sys/sockets/unix_passfd_test.c
diff --git a/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c b/tests/sys/sockets/unix_sendtorace_test.c
index 9fd748d..9fd748d 100644
--- a/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
+++ b/tests/sys/sockets/unix_sendtorace_test.c
diff --git a/tools/regression/sockets/unix_socket/unix_socket.c b/tests/sys/sockets/unix_socket_test.c
index 085366f..085366f 100644
--- a/tools/regression/sockets/unix_socket/unix_socket.c
+++ b/tests/sys/sockets/unix_socket_test.c
diff --git a/tools/regression/sockets/unix_sorflush/unix_sorflush.c b/tests/sys/sockets/unix_sorflush_test.c
index e0deb00..e0deb00 100644
--- a/tools/regression/sockets/unix_sorflush/unix_sorflush.c
+++ b/tests/sys/sockets/unix_sorflush_test.c
diff --git a/tools/regression/sockets/zerosend/zerosend.c b/tests/sys/sockets/zerosend_test.c
index 1f3217a..1f3217a 100644
--- a/tools/regression/sockets/zerosend/zerosend.c
+++ b/tests/sys/sockets/zerosend_test.c
diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
deleted file mode 100644
index e9bfba6..0000000
--- a/tools/regression/sockets/accept_fd_leak/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	accept_fd_leak
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
deleted file mode 100644
index 4d33728..0000000
--- a/tools/regression/sockets/accf_data_attach/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	accf_data_attach
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.t b/tools/regression/sockets/accf_data_attach/accf_data_attach.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/sockets/fstat/Makefile b/tools/regression/sockets/fstat/Makefile
deleted file mode 100644
index a583166..0000000
--- a/tools/regression/sockets/fstat/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	fstat
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile
deleted file mode 100644
index 6771d25..0000000
--- a/tools/regression/sockets/kqueue/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	kqueue
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/kqueue/kqueue.t b/tools/regression/sockets/kqueue/kqueue.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/sockets/kqueue/kqueue.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile
deleted file mode 100644
index e2eb135..0000000
--- a/tools/regression/sockets/listen_backlog/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	listen_backlog
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile
deleted file mode 100644
index 8f4dc4e..0000000
--- a/tools/regression/sockets/listenclose/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	listenclose
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile
deleted file mode 100644
index 1dc85ff..0000000
--- a/tools/regression/sockets/pr_atomic/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	pr_atomic
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
deleted file mode 100644
index d8fa5e0..0000000
--- a/tools/regression/sockets/reconnect/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	reconnect
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile
deleted file mode 100644
index f68b6c3..0000000
--- a/tools/regression/sockets/rtsocket/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	rtsocket
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sblock/Makefile b/tools/regression/sockets/sblock/Makefile
deleted file mode 100644
index aa2f890..0000000
--- a/tools/regression/sockets/sblock/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	sblock
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile
deleted file mode 100644
index 9d6f185..0000000
--- a/tools/regression/sockets/sendfile/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	sendfile
-MAN=
-WARNS?=	6
-DPADD=	${LIBMD}
-LDADD=	-lmd
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/shutdown/Makefile b/tools/regression/sockets/shutdown/Makefile
deleted file mode 100644
index 63045f5..0000000
--- a/tools/regression/sockets/shutdown/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	shutdown
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sigpipe/Makefile b/tools/regression/sockets/sigpipe/Makefile
deleted file mode 100644
index 5116701..0000000
--- a/tools/regression/sockets/sigpipe/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	sigpipe
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/so_setfib/Makefile b/tools/regression/sockets/so_setfib/Makefile
deleted file mode 100644
index 90111fb..0000000
--- a/tools/regression/sockets/so_setfib/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-PROG=	so_setfib
-MAN=
-WARNS?=	6
-
-.if ${MK_INET} != "no"
-CFLAGS+=	-DINET
-.endif
-.if ${MK_INET6} != "no"
-CFLAGS+=	-DINET6
-.endif
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile
deleted file mode 100644
index ed66e3c..0000000
--- a/tools/regression/sockets/socketpair/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-PROG=	socketpair
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile
deleted file mode 100644
index 52cc844..0000000
--- a/tools/regression/sockets/unix_bindconnect/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_bindconnect
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_close_race/Makefile b/tools/regression/sockets/unix_close_race/Makefile
deleted file mode 100644
index 370adc4..0000000
--- a/tools/regression/sockets/unix_close_race/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_close_race
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_cmsg/Makefile b/tools/regression/sockets/unix_cmsg/Makefile
deleted file mode 100644
index 9ccab6d..0000000
--- a/tools/regression/sockets/unix_cmsg/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_cmsg
-MAN=
-WARNS?=	3
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile
deleted file mode 100644
index 0c66493..0000000
--- a/tools/regression/sockets/unix_gc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_gc
-MAN=
-WARNS?=	3
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_passfd/Makefile b/tools/regression/sockets/unix_passfd/Makefile
deleted file mode 100644
index 600b7b1..0000000
--- a/tools/regression/sockets/unix_passfd/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_passfd
-MAN=
-WARNS?=	3
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile
deleted file mode 100644
index 75e7b9f..0000000
--- a/tools/regression/sockets/unix_sendtorace/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_sendtorace
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile
deleted file mode 100644
index bb60456..0000000
--- a/tools/regression/sockets/unix_socket/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_socket
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile
deleted file mode 100644
index db0aa6a..0000000
--- a/tools/regression/sockets/unix_sorflush/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	unix_sorflush
-MAN=
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile
deleted file mode 100644
index 1562acc..0000000
--- a/tools/regression/sockets/zerosend/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	zerosend
-MAN=
-WARNS?=	2
-
-.include <bsd.prog.mk>