MFC r281593,r282071,r282074,r282133,r282134,r282135,r282136,r282137,r282138:

r282071:

Integrate tools/regression/mqueue into the FreeBSD test suite as
tests/sys/mqueue

r282074:

Integrate tools/regression/aio/aiotest and tools/regression/aio/kqueue into the
FreeBSD test suite as tests/sys/aio

r282133:

Fill in the copyright boilerplate for the test program

r282134:

Add initial (unpolished) macros for interfacing with the FreeBSD test suite

This is very rough, but will be replaced/redesigned some time soon after I fix
the Jenkins breakage I introduced

r282135:

Use ATF_REQUIRE_KERNEL_MODULE instead of aio_available function

r282136:

- Use ATF_REQUIRE_KERNEL_MDOULE to require aio(4)
- Don't use /tmp as a basis for temporary files as it's outside of the ATF
  sandbox
- Don't override MAX macro in sys/param.h

r282137:

Use PLAIN_REQUIRE_KERNEL_MODULE to require "mqueuefs"

r282138:

Adjust CFLAGS to find freebsd_test_suite/macros.h

17 files changed, 0 insertions, 1728 deletions

diff --git a/tools/regression/aio/aiotest/Makefile b/tools/regression/aio/aiotest/Makefile
deleted file mode 100644
index 59d4316..0000000
--- a/tools/regression/aio/aiotest/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=	aiotest
-MAN=
-
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
-
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/aio/aiotest/aiotest.c b/tools/regression/aio/aiotest/aiotest.c
deleted file mode 100644
index 6a3d612..0000000
--- a/tools/regression/aio/aiotest/aiotest.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/*-
- * Copyright (c) 2004 Robert N. M. Watson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * Regression test to do some very basic AIO exercising on several types of
- * file descriptors.  Currently, the tests consist of initializing a fixed
- * size buffer with pseudo-random data, writing it to one fd using AIO, then
- * reading it from a second descriptor using AIO.  For some targets, the same
- * fd is used for write and read (i.e., file, md device), but for others the
- * operation is performed on a peer (pty, socket, fifo, etc).  A timeout is
- * initiated to detect undo blocking.  This test does not attempt to exercise
- * error cases or more subtle asynchronous behavior, just make sure that the
- * basic operations work on some basic object types.
- */
-
-#include <sys/param.h>
-#include <sys/module.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/mdioctl.h>
-
-#include <aio.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libutil.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-
-#define	PATH_TEMPLATE	"/tmp/aio.XXXXXXXXXX"
-
-/*
- * GLOBAL_MAX sets the largest usable buffer size to be read and written, as
- * it sizes ac_buffer in the aio_context structure.  It is also the default
- * size for file I/O.  For other types, we use smaller blocks or we risk
- * blocking (and we run in a single process/thread so that would be bad).
- */
-#define	GLOBAL_MAX	16384
-
-#define	BUFFER_MAX	GLOBAL_MAX
-struct aio_context {
-	const char	*ac_test;
-	int		 ac_read_fd, ac_write_fd;
-	long		 ac_seed;
-	char		 ac_buffer[GLOBAL_MAX];
-	int		 ac_buflen;
-	int		 ac_seconds;
-	void		 (*ac_cleanup)(void *arg);
-	void		*ac_cleanup_arg;
-};
-
-static int	aio_timedout;
-
-static void
-aio_available(void)
-{
-
-	if (modfind("aio") == -1)
-		errx(0,
-		    "aio support not available in the kernel; skipping "
-		    "testcases");
-}
-
-/*
- * Each test run specifies a timeout in seconds.  Use the somewhat obsoleted
- * signal(3) and alarm(3) APIs to set this up.
- */
-static void
-aio_timeout_signal(int sig __unused)
-{
-
-	aio_timedout = 1;
-}
-
-static void
-aio_timeout_start(const char *string1, const char *string2, int seconds)
-{
-
-	aio_timedout = 0;
-	if (signal(SIGALRM, aio_timeout_signal) == SIG_ERR)
-		errx(1, "FAIL: %s: %s: aio_timeout_set: signal(SIGALRM): %s",
-		    string1, string2, strerror(errno));
-	alarm(seconds);
-}
-
-static void
-aio_timeout_stop(const char *string1, const char *string2)
-{
-
-	if (signal(SIGALRM, NULL) == SIG_ERR)
-		errx(1, "FAIL: %s: %s: aio_timeout_stop: signal(NULL): %s",
-		    string1, string2, strerror(errno));
-	alarm(0);
-}
-
-/*
- * Fill a buffer given a seed that can be fed into srandom() to initialize
- * the PRNG in a repeatable manner.
- */
-static void
-aio_fill_buffer(char *buffer, int len, long seed)
-{
-	char ch;
-	int i;
-
-	srandom(seed);
-	for (i = 0; i < len; i++) {
-		ch = random() & 0xff;
-		buffer[i] = ch;
-	}
-}
-
-/*
- * Test that a buffer matches a given seed.  See aio_fill_buffer().  Return
- * (1) on a match, (0) on a mismatch.
- */
-static int
-aio_test_buffer(char *buffer, int len, long seed)
-{
-	char ch;
-	int i;
-
-	srandom(seed);
-	for (i = 0; i < len; i++) {
-		ch = random() & 0xff;
-		if (buffer[i] != ch)
-			return (0);
-	}
-	return (1);
-}
-
-/*
- * Initialize a testing context given the file descriptors provided by the
- * test setup.
- */
-static void
-aio_context_init(struct aio_context *ac, const char *test, int read_fd,
-    int write_fd, int buflen, int seconds, void (*cleanup)(void *),
-    void *cleanup_arg)
-{
-
-	if (buflen > BUFFER_MAX)
-		errx(1, "FAIL: %s: aio_context_init: buffer too large",
-		    test);
-	bzero(ac, sizeof(*ac));
-	ac->ac_test = test;
-	ac->ac_read_fd = read_fd;
-	ac->ac_write_fd = write_fd;
-	ac->ac_buflen = buflen;
-	srandomdev();
-	ac->ac_seed = random();
-	aio_fill_buffer(ac->ac_buffer, buflen, ac->ac_seed);
-	if (aio_test_buffer(ac->ac_buffer, buflen, ac->ac_seed) == 0)
-		errx(1, "%s: aio_context_init: aio_test_buffer: internal "
-		    "error", test);
-	ac->ac_seconds = seconds;
-	ac->ac_cleanup = cleanup;
-	ac->ac_cleanup_arg = cleanup_arg;
-}
-
-/*
- * Each tester can register a callback to clean up in the event the test
- * fails.  Preserve the value of errno so that subsequent calls to errx()
- * work properly.
- */
-static void
-aio_cleanup(struct aio_context *ac)
-{
-	int error;
-
-	if (ac->ac_cleanup == NULL)
-		return;
-	error = errno;
-	(ac->ac_cleanup)(ac->ac_cleanup_arg);
-	errno = error;
-}
-
-/*
- * Perform a simple write test of our initialized data buffer to the provided
- * file descriptor.
- */
-static void
-aio_write_test(struct aio_context *ac)
-{
-	struct aiocb aio, *aiop;
-	ssize_t len;
-
-	aio_available();
-
-	bzero(&aio, sizeof(aio));
-	aio.aio_buf = ac->ac_buffer;
-	aio.aio_nbytes = ac->ac_buflen;
-	aio.aio_fildes = ac->ac_write_fd;
-	aio.aio_offset = 0;
-
-	aio_timeout_start(ac->ac_test, "aio_write_test", ac->ac_seconds);
-
-	if (aio_write(&aio) < 0) {
-		if (errno == EINTR) {
-			if (aio_timedout) {
-				aio_cleanup(ac);
-				errx(1, "FAIL: %s: aio_write_test: "
-				    "aio_write: timed out", ac->ac_test);
-			}
-		}
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_write_test: aio_write: %s",
-		    ac->ac_test, strerror(errno));
-	}
-
-	len = aio_waitcomplete(&aiop, NULL);
-	if (len < 0) {
-		if (errno == EINTR) {
-			if (aio_timedout) {
-				aio_cleanup(ac);
-				errx(1, "FAIL: %s: aio_write_test: "
-				    "aio_waitcomplete: timed out",
-				    ac->ac_test);
-			}
-		}
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_write_test: aio_waitcomplete: %s",
-		    ac->ac_test, strerror(errno));
-	}
-
-	aio_timeout_stop(ac->ac_test, "aio_write_test");
-
-	if (len != ac->ac_buflen) {
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_write_test: aio_waitcomplete: short "
-		    "write (%jd)", ac->ac_test, (intmax_t)len);
-	}
-}
-
-/*
- * Perform a simple read test of our initialized data buffer from the
- * provided file descriptor.
- */
-static void
-aio_read_test(struct aio_context *ac)
-{
-	struct aiocb aio, *aiop;
-	ssize_t len;
-
-	aio_available();
-
-	bzero(ac->ac_buffer, ac->ac_buflen);
-	bzero(&aio, sizeof(aio));
-	aio.aio_buf = ac->ac_buffer;
-	aio.aio_nbytes = ac->ac_buflen;
-	aio.aio_fildes = ac->ac_read_fd;
-	aio.aio_offset = 0;
-
-	aio_timeout_start(ac->ac_test, "aio_read_test", ac->ac_seconds);
-
-	if (aio_read(&aio) < 0) {
-		if (errno == EINTR) {
-			if (aio_timedout) {
-				aio_cleanup(ac);
-				errx(1, "FAIL: %s: aio_read_test: "
-				    "aio_read: timed out", ac->ac_test);
-			}
-		}
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_read_test: aio_read %s", ac->ac_test,
-		    strerror(errno));
-	}
-
-	len = aio_waitcomplete(&aiop, NULL);
-	if (len < 0) {
-		if (errno == EINTR) {
-			if (aio_timedout) {
-				aio_cleanup(ac);
-				errx(1, "FAIL: %s: aio_read_test: "
-				    "aio_waitcomplete: timed out",
-				    ac->ac_test);
-			}
-		}
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_read_test: aio_waitcomplete: %s",
-		    ac->ac_test, strerror(errno));
-	}
-
-	aio_timeout_stop(ac->ac_test, "aio_read_test");
-
-	if (len != ac->ac_buflen) {
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_read_test: aio_waitcomplete: short "
-		    "read (%jd)", ac->ac_test, (intmax_t)len);
-	}
-
-	if (aio_test_buffer(ac->ac_buffer, ac->ac_buflen, ac->ac_seed) == 0) {
-		aio_cleanup(ac);
-		errx(1, "FAIL: %s: aio_read_test: buffer mismatch",
-		    ac->ac_test);
-	}
-}
-
-/*
- * Series of type-specific tests for AIO.  For now, we just make sure we can
- * issue a write and then a read to each type.  We assume that once a write
- * is issued, a read can follow.
- */
-
-/*
- * Test with a classic file.  Assumes we can create a moderate size temporary
- * file.
- */
-struct aio_file_arg {
-	int	 afa_fd;
-	char	*afa_pathname;
-};
-
-static void
-aio_file_cleanup(void *arg)
-{
-	struct aio_file_arg *afa;
-
-	afa = arg;
-	close(afa->afa_fd);
-	unlink(afa->afa_pathname);
-}
-
-#define	FILE_LEN	GLOBAL_MAX
-#define	FILE_TIMEOUT	30
-static void
-aio_file_test(void)
-{
-	char pathname[PATH_MAX];
-	struct aio_file_arg arg;
-	struct aio_context ac;
-	int fd;
-
-	aio_available();
-
-	strcpy(pathname, PATH_TEMPLATE);
-	fd = mkstemp(pathname);
-	if (fd == -1)
-		errx(1, "FAIL: aio_file_test: mkstemp: %s",
-		    strerror(errno));
-
-	arg.afa_fd = fd;
-	arg.afa_pathname = pathname;
-
-	aio_context_init(&ac, "aio_file_test", fd, fd, FILE_LEN,
-	    FILE_TIMEOUT, aio_file_cleanup, &arg);
-	aio_write_test(&ac);
-	aio_read_test(&ac);
-
-	aio_file_cleanup(&arg);
-	
-	fprintf(stderr, "PASS: aio_file_test\n");
-}
-
-struct aio_fifo_arg {
-	int	 afa_read_fd;
-	int	 afa_write_fd;
-	char	*afa_pathname;
-};
-
-static void
-aio_fifo_cleanup(void *arg)
-{
-	struct aio_fifo_arg *afa;
-
-	afa = arg;
-	if (afa->afa_read_fd != -1)
-		close(afa->afa_read_fd);
-	if (afa->afa_write_fd != -1)
-		close(afa->afa_write_fd);
-	unlink(afa->afa_pathname);
-}
-
-#define	FIFO_LEN	256
-#define	FIFO_TIMEOUT	30
-static void
-aio_fifo_test(void)
-{
-	int error, read_fd = -1, write_fd = -1;
-	struct aio_fifo_arg arg;
-	char pathname[PATH_MAX];
-	struct aio_context ac;
-
-	aio_available();
-
-	/*
-	 * In theory, mkstemp() can return a name that is then collided with.
-	 * Because this is a regression test, we treat that as a test failure
-	 * rather than retrying.
-	 */
-	strcpy(pathname, PATH_TEMPLATE);
-	if (mkstemp(pathname) == -1)
-		err(1, "FAIL: aio_fifo_test: mkstemp failed");
-	if (unlink(pathname) == -1)
-		err(1, "FAIL: aio_fifo_test: unlink failed");
-	if (mkfifo(pathname, 0600) == -1)
-		errx(1, "FAIL: aio_fifo_test: mkfifo: %s", strerror(errno));
-	arg.afa_pathname = pathname;
-	arg.afa_read_fd = -1;
-	arg.afa_write_fd = -1;
-
-	read_fd = open(pathname, O_RDONLY | O_NONBLOCK);
-	if (read_fd == -1) {
-		error = errno;
-		aio_fifo_cleanup(&arg);
-		errno = error;
-		errx(1, "FAIL: aio_fifo_test: read_fd open: %s",
-		    strerror(errno));
-	}
-	arg.afa_read_fd = read_fd;
-
-	write_fd = open(pathname, O_WRONLY);
-	if (write_fd == -1) {
-		error = errno;
-		aio_fifo_cleanup(&arg);
-		errno = error;
-		errx(1, "FAIL: aio_fifo_test: write_fd open: %s",
-		    strerror(errno));
-	}
-	arg.afa_write_fd = write_fd;
-
-	aio_context_init(&ac, "aio_fifo_test", read_fd, write_fd, FIFO_LEN,
-	    FIFO_TIMEOUT, aio_fifo_cleanup, &arg);
-	aio_write_test(&ac);
-	aio_read_test(&ac);
-
-	aio_fifo_cleanup(&arg);
-
-	fprintf(stderr, "PASS: aio_fifo_test\n");
-}
-
-struct aio_unix_socketpair_arg {
-	int	asa_sockets[2];
-};
-
-static void
-aio_unix_socketpair_cleanup(void *arg)
-{
-	struct aio_unix_socketpair_arg *asa;
-
-	asa = arg;
-	close(asa->asa_sockets[0]);
-	close(asa->asa_sockets[1]);
-}
-
-#define	UNIX_SOCKETPAIR_LEN	256
-#define	UNIX_SOCKETPAIR_TIMEOUT	30
-static void
-aio_unix_socketpair_test(void)
-{
-	struct aio_unix_socketpair_arg arg;
-	struct aio_context ac;
-	int sockets[2];
-
-	aio_available();
-
-	if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0)
-		errx(1, "FAIL: aio_socketpair_test: socketpair: %s",
-		    strerror(errno));
-
-	arg.asa_sockets[0] = sockets[0];
-	arg.asa_sockets[1] = sockets[1];
-	aio_context_init(&ac, "aio_unix_socketpair_test", sockets[0],
-	    sockets[1], UNIX_SOCKETPAIR_LEN, UNIX_SOCKETPAIR_TIMEOUT,
-	    aio_unix_socketpair_cleanup, &arg);
-	aio_write_test(&ac);
-	aio_read_test(&ac);
-
-	aio_unix_socketpair_cleanup(&arg);
-
-	fprintf(stderr, "PASS: aio_unix_socketpair_test\n");
-}
-
-struct aio_pty_arg {
-	int	apa_read_fd;
-	int	apa_write_fd;
-};
-
-static void
-aio_pty_cleanup(void *arg)
-{
-	struct aio_pty_arg *apa;
-
-	apa = arg;
-	close(apa->apa_read_fd);
-	close(apa->apa_write_fd);
-};
-
-#define	PTY_LEN		256
-#define	PTY_TIMEOUT	30
-static void
-aio_pty_test(void)
-{
-	struct aio_pty_arg arg;
-	struct aio_context ac;
-	int read_fd, write_fd;
-	struct termios ts;
-	int error;
-
-	aio_available();
-
-	if (openpty(&read_fd, &write_fd, NULL, NULL, NULL) < 0)
-		errx(1, "FAIL: aio_pty_test: openpty: %s", strerror(errno));
-
-	arg.apa_read_fd = read_fd;
-	arg.apa_write_fd = write_fd;
-
-	if (tcgetattr(write_fd, &ts) < 0) {
-		error = errno;
-		aio_pty_cleanup(&arg);
-		errno = error;
-		errx(1, "FAIL: aio_pty_test: tcgetattr: %s",
-		    strerror(errno));
-	}
-	cfmakeraw(&ts);
-	if (tcsetattr(write_fd, TCSANOW, &ts) < 0) {
-		error = errno;
-		aio_pty_cleanup(&arg);
-		errno = error;
-		errx(1, "FAIL: aio_pty_test: tcsetattr: %s",
-		    strerror(errno));
-	}
-
-	aio_context_init(&ac, "aio_pty_test", read_fd, write_fd, PTY_LEN,
-	    PTY_TIMEOUT, aio_pty_cleanup, &arg);
-	aio_write_test(&ac);
-	aio_read_test(&ac);
-
-	aio_pty_cleanup(&arg);
-
-	fprintf(stderr, "PASS: aio_pty_test\n");
-}
-
-static void
-aio_pipe_cleanup(void *arg)
-{
-	int *pipes = arg;
-
-	close(pipes[0]);
-	close(pipes[1]);
-}
-
-#define	PIPE_LEN	256
-#define	PIPE_TIMEOUT	30
-static void
-aio_pipe_test(void)
-{	
-	struct aio_context ac;
-	int pipes[2];
-
-	aio_available();
-
-	if (pipe(pipes) < 0)
-		errx(1, "FAIL: aio_pipe_test: pipe: %s", strerror(errno));
-
-	aio_context_init(&ac, "aio_file_test", pipes[0], pipes[1], PIPE_LEN,
-	    PIPE_TIMEOUT, aio_pipe_cleanup, pipes);
-	aio_write_test(&ac);
-	aio_read_test(&ac);
-
-	aio_pipe_cleanup(pipes);
-
-	fprintf(stderr, "PASS: aio_pipe_test\n");
-}
-
-struct aio_md_arg {
-	int	ama_mdctl_fd;
-	int	ama_unit;
-	int	ama_fd;
-};
-
-static void
-aio_md_cleanup(void *arg)
-{
-	struct aio_md_arg *ama;
-	struct md_ioctl mdio;
-	int error;
-
-	ama = arg;
-
-	if (ama->ama_fd != -1)
-		close(ama->ama_fd);
-
-	if (ama->ama_unit != -1) {
-		bzero(&mdio, sizeof(mdio));
-		mdio.md_version = MDIOVERSION;
-		mdio.md_unit = ama->ama_unit;
-		if (ioctl(ama->ama_mdctl_fd, MDIOCDETACH, &mdio) < 0) {
-			error = errno;
-			close(ama->ama_mdctl_fd);
-			errno = error;
-			warnx("FAIL: aio_md_test: MDIOCDETACH: %s",
-			    strerror(errno));
-		}
-	}
-
-	close(ama->ama_mdctl_fd);
-}
-
-#define	MD_LEN		GLOBAL_MAX
-#define	MD_TIMEOUT	30
-static void
-aio_md_test(void)
-{
-	int error, fd, mdctl_fd, unit;
-	char pathname[PATH_MAX];
-	struct aio_md_arg arg;
-	struct aio_context ac;
-	struct md_ioctl mdio;
-
-	aio_available();
-
-	if (geteuid() != 0) {
-		fprintf(stderr, "WARNING: aio_md_test: skipped as euid "
-		    "!= 0\n");
-		return;
-	}
-
-	mdctl_fd = open("/dev/" MDCTL_NAME, O_RDWR, 0);
-	if (mdctl_fd < 0)
-		errx(1, "FAIL: aio_md_test: open(/dev/%s): %s", MDCTL_NAME,
-		    strerror(errno));
-
-	bzero(&mdio, sizeof(mdio));
-	mdio.md_version = MDIOVERSION;
-	mdio.md_type = MD_MALLOC;
-	mdio.md_options = MD_AUTOUNIT | MD_COMPRESS;
-	mdio.md_mediasize = GLOBAL_MAX;
-	mdio.md_sectorsize = 512;
-
-	arg.ama_mdctl_fd = mdctl_fd;
-	arg.ama_unit = -1;
-	arg.ama_fd = -1;
-	if (ioctl(mdctl_fd, MDIOCATTACH, &mdio) < 0) {
-		error = errno;
-		aio_md_cleanup(&arg);
-		errno = error;
-		errx(1, "FAIL: aio_md_test: MDIOCATTACH: %s",
-		    strerror(errno));
-	}
-
-	arg.ama_unit = unit = mdio.md_unit;
-	snprintf(pathname, PATH_MAX, "/dev/md%d", unit);
-	fd = open(pathname, O_RDWR);
-	if (fd < 0) {
-		error = errno;
-		aio_md_cleanup(&arg);
-		errno = error;
-		errx(1, "FAIL: aio_md_test: open(%s): %s", pathname,
-		    strerror(errno));
-	}
-	arg.ama_fd = fd;
-
-	aio_context_init(&ac, "aio_md_test", fd, fd, MD_LEN, MD_TIMEOUT,
-	    aio_md_cleanup, &arg);
-	aio_write_test(&ac);
-	aio_read_test(&ac);
-
-	aio_md_cleanup(&arg);
-
-	fprintf(stderr, "PASS: aio_md_test\n");
-}
-
-int
-main(void)
-{
-
-	aio_file_test();
-	aio_fifo_test();
-	aio_unix_socketpair_test();
-	aio_pty_test();
-	aio_pipe_test();
-	aio_md_test();
-
-	return (0);
-}
diff --git a/tools/regression/aio/kqueue/Makefile b/tools/regression/aio/kqueue/Makefile
deleted file mode 100644
index 39c1aa1..0000000
--- a/tools/regression/aio/kqueue/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG=	aio_kqueue
-MAN=
-
-WARNS?=	6
-
-SUBDIR+=	lio
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/aio/kqueue/aio_kqueue.c b/tools/regression/aio/kqueue/aio_kqueue.c
deleted file mode 100644
index 87b4125..0000000
--- a/tools/regression/aio/kqueue/aio_kqueue.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * Copyright (C) 2005 IronPort Systems, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/* 
- * Prerequisities:
- * - AIO support must be compiled into the kernel (see sys/<arch>/NOTES for
- *   more details).
- *
- * Note: it is a good idea to run this against a physical drive to 
- * exercise the physio fast path (ie. aio_kqueue /dev/<something safe>)
- */
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-#include <aio.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define PATH_TEMPLATE   "/tmp/aio.XXXXXXXXXX"
-
-#define MAX 128
-#define MAX_RUNS 300
-/* #define DEBUG */
-
-int
-main (int argc, char *argv[])
-{
-	int fd;
-	struct aiocb *iocb[MAX], *kq_iocb;
-	int i, result, run, error, j;
-	char buffer[32768];
-	int kq = kqueue();
-	struct kevent ke, kq_returned;
-	struct timespec ts;
-	int cancel, pending, tmp_file = 0, failed = 0;
-	char *file, pathname[sizeof(PATH_TEMPLATE)+1];
-
-	if (kq < 0) {
-		perror("No kqeueue\n");
-		exit(1);
-	}
-
-	if (argc == 1) { 
-		strcpy(pathname, PATH_TEMPLATE);
-		fd = mkstemp(pathname);
-		file = pathname;
-		tmp_file = 1;
-	} else {
-		file = argv[1];
-		fd = open(file, O_RDWR|O_CREAT, 0666);
-	}
-	if (fd == -1)
-		err(1, "Can't open %s\n", file);
-
-	for (run = 0; run < MAX_RUNS; run++){
-#ifdef DEBUG
-		printf("Run %d\n", run);
-#endif
-		for (i = 0; i < MAX; i++) {
-			iocb[i] = (struct aiocb *)calloc(1,
-			    sizeof(struct aiocb));
-			if (iocb[i] == NULL)
-				err(1, "calloc");
-		}
-		
-		pending = 0;	
-		for (i = 0; i < MAX; i++) {
-			pending++;
-			iocb[i]->aio_nbytes = sizeof(buffer);
-			iocb[i]->aio_buf = buffer;
-			iocb[i]->aio_fildes = fd;
-			iocb[i]->aio_offset = iocb[i]->aio_nbytes * i * run;
-			
-			iocb[i]->aio_sigevent.sigev_notify_kqueue = kq;
-			iocb[i]->aio_sigevent.sigev_value.sival_ptr = iocb[i];
-			iocb[i]->aio_sigevent.sigev_notify = SIGEV_KEVENT;
-			
-			result = aio_write(iocb[i]);
-			if (result != 0) {
-				perror("aio_write");
-				printf("Result %d iteration %d\n", result, i);
-				exit(1);
-			}
-#ifdef DEBUG
-			printf("WRITE %d is at %p\n", i, iocb[i]);
-#endif
-			result = rand();
-			if (result < RAND_MAX/32) {
-				if (result > RAND_MAX/64) {
-					result = aio_cancel(fd, iocb[i]);
-#ifdef DEBUG
-					printf("Cancel %d %p result %d\n", i, iocb[i], result);
-#endif
-					if (result == AIO_CANCELED) {
-						aio_return(iocb[i]);
-						iocb[i] = NULL;
-						pending--;
-					}
-				}
-			}
-		}
-		cancel = MAX - pending;
-		
-		i = 0;
-		while (pending) {
-
-			for (;;) {
-
-				bzero(&ke, sizeof(ke));
-				bzero(&kq_returned, sizeof(ke));
-				ts.tv_sec = 0;
-				ts.tv_nsec = 1;
-				result = kevent(kq, NULL, 0, 
-						&kq_returned, 1, &ts);
-				error = errno;
-				if (result < 0)
-					perror("kevent error: ");
-				kq_iocb = kq_returned.udata;
-#ifdef DEBUG
-				printf("kevent %d %d errno %d return.ident %p "
-				       "return.data %p return.udata %p %p\n", 
-				       i, result, error, 
-				       kq_returned.ident, kq_returned.data, 
-				       kq_returned.udata, 
-				       kq_iocb);
-#endif
-				
-				if (kq_iocb)
-					break;
-#ifdef DEBUG
-				printf("Try again left %d out of %d %d\n",
-				    pending, MAX, cancel);
-#endif
-			}			
-			
-			for (j = 0; j < MAX && iocb[j] != kq_iocb;
-			   j++) ;
-#ifdef DEBUG
-			printf("kq_iocb %p\n", kq_iocb);
-			
-			printf("Error Result for %d is %d pending %d\n",
-			    j, result, pending);
-#endif
-			result = aio_return(kq_iocb);
-#ifdef DEBUG
-			printf("Return Result for %d is %d\n\n", j, result);
-#endif
-			if (result != sizeof(buffer)) {
-				printf("FAIL: run %d, operation %d, result %d "
-				    " (errno=%d) should be %zu\n", run, pending,
-				    result, errno, sizeof(buffer));
-				failed++;
-			} else
-				printf("PASS: run %d, left %d\n", run,
-				    pending - 1);
-
-			free(kq_iocb);
-			iocb[j] = NULL;
-			pending--;
-			i++;
-		}	
-
-		for (i = 0; i < MAX; i++)
-			free(iocb[i]);
-
-	}
-
-	if (tmp_file)
-		unlink(pathname);
-
-	if (failed != 0)
-		printf("FAIL: %d tests failed\n", failed);
-	else
-		printf("PASS: All tests passed\n");
-
-	exit (failed == 0 ? 0 : 1);
-}
diff --git a/tools/regression/aio/kqueue/lio/Makefile b/tools/regression/aio/kqueue/lio/Makefile
deleted file mode 100644
index da054e4..0000000
--- a/tools/regression/aio/kqueue/lio/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG=	lio_kqueue
-MAN=
-
-WARNS?=	6
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/aio/kqueue/lio/lio_kqueue.c b/tools/regression/aio/kqueue/lio/lio_kqueue.c
deleted file mode 100644
index ad7fc68..0000000
--- a/tools/regression/aio/kqueue/lio/lio_kqueue.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*-
- * Copyright (C) 2005 IronPort Systems, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * Note: it is a good idea to run this against a physical drive to
- * exercise the physio fast path (ie. lio_kqueue /dev/<something safe>)
- * This will ensure op's counting is correct.  It is currently broken.
- *
- * Also note that LIO & kqueue is not implemented in FreeBSD yet, LIO
- * is also broken with respect to op's and some paths.
- *
- * A patch to make this work is at:
- * 	http://www.ambrisko.com/doug/listio_kqueue/listio_kqueue.patch
- */
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-#include <aio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define PATH_TEMPLATE   "/tmp/aio.XXXXXXXXXX"
-
-#define LIO_MAX 5
-#define MAX LIO_MAX * 16
-#define MAX_RUNS 300
-
-int
-main(int argc, char *argv[]){
-	int fd;
-	struct aiocb *iocb[MAX];
-	struct aiocb **lio[LIO_MAX], **lio_element, **kq_lio;
-	int i, result, run, error, j, k;
-	char buffer[32768];
-	int kq = kqueue();
-	struct kevent ke, kq_returned;
-	struct timespec ts;
-	struct sigevent sig;
-	time_t time1, time2;
-	char *file, pathname[sizeof(PATH_TEMPLATE)-1];
-	int tmp_file = 0, failed = 0;
-
-	if (kq < 0) {
-		perror("No kqeueue\n");
-		exit(1);
-	}
-
-	if (argc == 1) {
-		strcpy(pathname, PATH_TEMPLATE);
-		fd = mkstemp(pathname);
-		file = pathname;
-		tmp_file = 1;
-	} else {
-		file = argv[1];
-		fd = open(file, O_RDWR|O_CREAT, 0666);
-        }
-	if (fd < 0){
-		fprintf(stderr, "Can't open %s\n", argv[1]);
-		perror("");
-		exit(1);
-	}
-
-#ifdef DEBUG
-	printf("Hello kq %d fd %d\n", kq, fd);
-#endif
-
-	for (run = 0; run < MAX_RUNS; run++){
-#ifdef DEBUG
-		printf("Run %d\n", run);
-#endif
-		for (j = 0; j < LIO_MAX; j++) {
-			lio[j] = (struct aiocb **)
-				malloc(sizeof(struct aiocb *) * MAX/LIO_MAX);
-			for(i = 0; i < MAX / LIO_MAX; i++) {
-				k = (MAX / LIO_MAX * j) + i;
-				lio_element = lio[j];
-				lio[j][i] = iocb[k] = (struct aiocb *)
-					malloc(sizeof(struct aiocb));
-				bzero(iocb[k], sizeof(struct aiocb));
-				iocb[k]->aio_nbytes = sizeof(buffer);
-				iocb[k]->aio_buf = buffer;
-				iocb[k]->aio_fildes = fd;
-				iocb[k]->aio_offset 
-				  = iocb[k]->aio_nbytes * k * (run + 1);
-
-#ifdef DEBUG
-				printf("hello iocb[k] %d\n",
-				       iocb[k]->aio_offset);
-#endif
-				iocb[k]->aio_lio_opcode = LIO_WRITE;
-			}
-			sig.sigev_notify_kqueue = kq;
-			sig.sigev_value.sival_ptr = lio[j];
-			sig.sigev_notify = SIGEV_KEVENT;
-			time(&time1);
-			result = lio_listio(LIO_NOWAIT, lio[j],
-					    MAX / LIO_MAX, &sig);
-			error = errno;
-			time(&time2);
-#ifdef DEBUG
-			printf("Time %d %d %d result -> %d\n", 
-			    time1, time2, time2-time1, result);
-#endif
-			if (result != 0) {
-			        errno = error;
-				perror("list_listio");
-				printf("FAIL: Result %d iteration %d\n",result, j);
-				exit(1);
-			}
-#ifdef DEBUG
-			printf("write %d is at %p\n", j, lio[j]);
-#endif
-		}
-
-		for(i = 0; i < LIO_MAX; i++) {
-			for(j = LIO_MAX - 1; j >=0; j--) {
-				if (lio[j])
-					break;
-			}
-
-			for(;;) {
-				bzero(&ke, sizeof(ke));
-				bzero(&kq_returned, sizeof(ke));
-				ts.tv_sec = 0;
-				ts.tv_nsec = 1;
-#ifdef DEBUG
-				printf("FOO lio %d -> %p\n", j, lio[j]);
-#endif
-				EV_SET(&ke, (uintptr_t)lio[j], 
-				       EVFILT_LIO, EV_ONESHOT, 0, 0, iocb[j]);
-				result = kevent(kq, NULL, 0, 
-						&kq_returned, 1, &ts);
-				error = errno;
-				if (result < 0) {
-					perror("kevent error: ");
-				}
-				kq_lio = kq_returned.udata;
-#ifdef DEBUG
-				printf("kevent %d %d errno %d return.ident %p "
-				       "return.data %p return.udata %p %p\n", 
-				       i, result, error, 
-				       kq_returned.ident, kq_returned.data, 
-				       kq_returned.udata, 
-				       lio[j]);
-#endif
-
-				if(kq_lio)
-					break;
-#ifdef DEBUG
-				printf("Try again\n");
-#endif
-			}
-
-#ifdef DEBUG
-			printf("lio %p\n", lio);
-#endif
-
-			for (j = 0; j < LIO_MAX; j++) {
-				if (lio[j] == kq_lio) {
-					break;
-				}
-			}
-			if (j == LIO_MAX) {
-			  printf("FAIL:\n");
-			  exit(1);
-			}
-
-#ifdef DEBUG
-			printf("Error Result for %d is %d\n", j, result);
-#endif
-			if (result < 0) {
-				printf("FAIL: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result);
-				failed = 1;
-			} else {
-				printf("PASS: run %d, operation %d result %d \n", run, LIO_MAX - i -1, result);
-			}
-			for(k = 0; k < MAX / LIO_MAX; k++){
-				result = aio_return(kq_lio[k]);
-#ifdef DEBUG
-				printf("Return Resulto for %d %d is %d\n", j, k, result);
-#endif
-				if (result != sizeof(buffer)) {
-					printf("FAIL: run %d, operation %d sub-opt %d  result %d (errno=%d) should be %zu\n",
-					   run, LIO_MAX - i -1, k, result, errno, sizeof(buffer));
-				} else {
-					printf("PASS: run %d, operation %d sub-opt %d  result %d\n",
-					   run, LIO_MAX - i -1, k, result);
-				}
-			}
-#ifdef DEBUG
-			printf("\n");
-#endif
-
-			for(k = 0; k < MAX / LIO_MAX; k++) {
-				free(lio[j][k]);
-			}
-			free(lio[j]);
-			lio[j] = NULL;
-		}
-	}
-#ifdef DEBUG
-	printf("Done\n");
-#endif
-
-	if (tmp_file) {
-		unlink(pathname);
-	}
-
-	if (failed) {
-		printf("FAIL: Atleast one\n");
-		exit(1);
-	} else {
-		printf("PASS: All\n");
-		exit(0);
-	}
-}
diff --git a/tools/regression/mqueue/Makefile b/tools/regression/mqueue/Makefile
deleted file mode 100644
index a4f386b..0000000
--- a/tools/regression/mqueue/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=mqtest1 mqtest2 mqtest3 mqtest4 mqtest5
-
-.include <bsd.subdir.mk>
diff --git a/tools/regression/mqueue/mqtest1/Makefile b/tools/regression/mqueue/mqtest1/Makefile
deleted file mode 100644
index 3a50cee..0000000
--- a/tools/regression/mqueue/mqtest1/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PROG=mqtest1
-DPADD=	${LIBRT}
-LDADD=	-lrt
-MAN=
-DEBUG_FLAGS=-g
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest1/mqtest1.c b/tools/regression/mqueue/mqtest1/mqtest1.c
deleted file mode 100644
index 25fc1ba..0000000
--- a/tools/regression/mqueue/mqtest1/mqtest1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $FreeBSD$ */
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <mqueue.h>
-#include <signal.h>
-#include <stdio.h>
-
-#define MQNAME	"/mytstqueue1"
-
-int main()
-{
-	struct mq_attr attr, attr2;
-	struct sigevent sigev;
-	mqd_t mq;
-	int status;
-
-	attr.mq_maxmsg  = 2;
-	attr.mq_msgsize = 100;
-	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == (mqd_t)-1)
-		err(1, "mq_open");
-	status = mq_unlink(MQNAME);
-	if (status)
-		err(1, "mq_unlink");
-	status = mq_getattr(mq, &attr2);
-	if (status)
-		err(1, "mq_getattr");
-	if (attr.mq_maxmsg != attr2.mq_maxmsg)
-		err(1, "mq_maxmsg changed");
-	if (attr.mq_msgsize != attr2.mq_msgsize)
-		err(1, "mq_msgsize changed");
-
-	sigev.sigev_notify = SIGEV_SIGNAL;
-	sigev.sigev_signo = SIGRTMIN;
-	status = mq_notify(mq, &sigev);
-	if (status)
-		err(1, "mq_notify");
-	status = mq_notify(mq, &sigev);
-	if (status == 0)
-		err(1, "mq_notify 2");
-	else if (errno != EBUSY)
-		err(1, "mq_notify 3");
-	status = mq_notify(mq, NULL);
-	if (status)
-		err(1, "mq_notify 4");
-	status = mq_close(mq);
-	if (status)
-		err(1, "mq_close");
-	return (0);
-}
diff --git a/tools/regression/mqueue/mqtest2/Makefile b/tools/regression/mqueue/mqtest2/Makefile
deleted file mode 100644
index 0709854..0000000
--- a/tools/regression/mqueue/mqtest2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PROG=mqtest2
-DPADD=	${LIBRT}
-LDADD=	-lrt
-MAN=
-DEBUG_FLAGS=-g
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest2/mqtest2.c b/tools/regression/mqueue/mqtest2/mqtest2.c
deleted file mode 100644
index bfe6d97..0000000
--- a/tools/regression/mqueue/mqtest2/mqtest2.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $FreeBSD$ */
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <fcntl.h>
-#include <mqueue.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define MQNAME	"/mytstqueue2"
-#define LOOPS	1000
-#define PRIO	10
-
-void alarmhandler(int sig)
-{
-	write(1, "timeout\n", 8);
-	_exit(1);
-}
-
-int main()
-{
-	struct mq_attr attr;
-	mqd_t mq;
-	int status, pid;
-	
-	mq_unlink(MQNAME);
-
-	attr.mq_maxmsg  = 5;
-	attr.mq_msgsize = 128;
-	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == (mqd_t)-1)
-		err(1, "mq_open");
-	status = mq_getattr(mq, &attr);
-	if (status)
-		err(1, "mq_getattr");
-	pid = fork();
-	if (pid == 0) { /* child */
-		int prio, j, i;
-		char *buf;
-
-		mq_close(mq);
-
-		signal(SIGALRM, alarmhandler);
-
-		mq = mq_open(MQNAME, O_RDWR);
-		if (mq == (mqd_t)-1)
-			err(1, "child: mq_open");
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			alarm(3);
-			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
-			if (status == -1)
-				err(2, "child: mq_receive");
-			for (i = 0; i < attr.mq_msgsize; ++i)
-				if (buf[i] != i)
-					err(3, "child: message data corrupted");
-			if (prio != PRIO)
-				err(4, "child: priority is incorrect: %d",
-					prio);
-		}
-		alarm(0);
-		free(buf);
-		mq_close(mq);
-		return (0);
-	} else if (pid == -1) {
-		err(1, "fork()");
-	} else {
-		char *buf;
-		int i, j, prio;
-
-		signal(SIGALRM, alarmhandler);
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			for (i = 0; i < attr.mq_msgsize; ++i)
-				buf[i] = i;
-			alarm(3);
-			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
-			if (status)
-				err(1, "mq_send");
-		}
-		alarm(3);
-		wait(&status);
-		alarm(0);
-	}
-	status = mq_close(mq);
-	if (status)
-		err(1, "mq_close");
-	mq_unlink(MQNAME);
-	return (0);
-}
diff --git a/tools/regression/mqueue/mqtest3/Makefile b/tools/regression/mqueue/mqtest3/Makefile
deleted file mode 100644
index 514cbac..0000000
--- a/tools/regression/mqueue/mqtest3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PROG=mqtest3
-DPADD=	${LIBRT}
-LDADD=	-lrt
-MAN=
-DEBUG_FLAGS=-g
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest3/mqtest3.c b/tools/regression/mqueue/mqtest3/mqtest3.c
deleted file mode 100644
index aa47ffa..0000000
--- a/tools/regression/mqueue/mqtest3/mqtest3.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $FreeBSD$ */
-
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <fcntl.h>
-#include <mqueue.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define MQNAME	"/mytstqueue3"
-#define LOOPS	1000
-#define PRIO	10
-
-void sighandler(int sig)
-{
-	write(1, "timeout\n", 8);
-	_exit(1);
-}
-
-int main()
-{
-	mqd_t mq;
-	int status;
-	struct mq_attr attr;
-	int pid;
-	fd_set set;
-
-	mq_unlink(MQNAME);
-
-	attr.mq_maxmsg  = 5;
-	attr.mq_msgsize = 128;
-	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == (mqd_t)-1)
-		err(1, "mq_open()");
-	status = mq_getattr(mq, &attr);
-	if (status)
-		err(1, "mq_getattr()");
-	
-	pid = fork();
-	if (pid == 0) { /* child */
-		int prio, j, i;
-		char *buf;
-
-		mq_close(mq);
-
-		signal(SIGALRM, sighandler);
-
-		mq = mq_open(MQNAME, O_RDWR);
-		if (mq == (mqd_t)-1)
-			err(1, "child process: mq_open");
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			FD_ZERO(&set);
-			FD_SET(__mq_oshandle(mq), &set);
-			alarm(3);
-			status = select(__mq_oshandle(mq)+1, &set, NULL, NULL, NULL);
-			if (status != 1)
-				err(1, "child process: select()");
-			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
-			if (status == -1)
-				err(2, "child process: mq_receive");
-			for (i = 0; i < attr.mq_msgsize; ++i)
-				if (buf[i] != i)
-					err(3, "message data corrupted");
-			if (prio != PRIO)
-				err(4, "priority is incorrect: %d", prio);
-		}
-		alarm(0);
-		free(buf);
-		mq_close(mq);
-		return (0);
-	} else if (pid == -1) {
-		err(1, "fork()");
-	} else {
-		char *buf;
-		int i, j, prio;
-
-		signal(SIGALRM, sighandler);
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			for (i = 0; i < attr.mq_msgsize; ++i) {
-				buf[i] = i;
-			}
-			alarm(3);
-			FD_ZERO(&set);
-			FD_SET(__mq_oshandle(mq), &set);
-			status = select(__mq_oshandle(mq)+1, NULL, &set, NULL, NULL);
-			if (status != 1)
-				err(1, "select()");
-			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
-			if (status) {
-				kill(pid, SIGKILL);
-				err(2, "mq_send()");
-			}
-		}
-		alarm(3);
-		wait(&status);
-		alarm(0);
-	}
-	status = mq_close(mq);
-	if (status)
-		err(1, "mq_close");
-	mq_unlink(MQNAME);
-	return (0);
-}
diff --git a/tools/regression/mqueue/mqtest4/Makefile b/tools/regression/mqueue/mqtest4/Makefile
deleted file mode 100644
index 781d76d..0000000
--- a/tools/regression/mqueue/mqtest4/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PROG=mqtest4
-DPADD=	${LIBRT}
-LDADD=	-lrt
-MAN=
-DEBUG_FLAGS=-g
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest4/mqtest4.c b/tools/regression/mqueue/mqtest4/mqtest4.c
deleted file mode 100644
index 80a7f88..0000000
--- a/tools/regression/mqueue/mqtest4/mqtest4.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* $FreeBSD$ */
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <fcntl.h>
-#include <mqueue.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define MQNAME	"/mytstqueue4"
-#define LOOPS	1000
-#define PRIO	10
-
-void sighandler(int sig)
-{
-	write(1, "timeout\n", 8);
-	_exit(1);
-}
-
-int main()
-{
-	mqd_t mq;
-	int status;
-	struct mq_attr attr;
-	int pid;
-	fd_set set;
-	int kq;
-	struct kevent kev;
-
-	mq_unlink(MQNAME);
-
-	attr.mq_maxmsg  = 5;
-	attr.mq_msgsize = 128;
-	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == (mqd_t) -1)
-		err(1, "mq_open()");
-	status = mq_getattr(mq, &attr);
-	if (status)
-		err(1, "mq_getattr()");
-	pid = fork();
-	if (pid == 0) { /* child */
-		int prio, j, i;
-		char *buf;
-
-		mq_close(mq);
-		kq = kqueue();
-		mq = mq_open(MQNAME, O_RDWR);
-		if (mq == (mqd_t)-1)
-			err(1, "child: mq_open");
-		EV_SET(&kev, __mq_oshandle(mq), EVFILT_READ, EV_ADD, 0, 0, 0);
-		status = kevent(kq, &kev, 1, NULL, 0, NULL);
-		if (status == -1)
-			err(1, "child: kevent");
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			alarm(3);
-			status = kevent(kq, NULL, 0, &kev, 1, NULL);
-			if (status != 1)
-				err(1, "child: kevent 2");
-			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
-			if (status == -1)
-				err(2, "child: mq_receive");
-			for (i = 0; i < attr.mq_msgsize; ++i)
-				if (buf[i] != i)
-					err(3, "child: message data corrupted");
-			if (prio != PRIO)
-				err(4, "child: priority is incorrect: %d",
-					 prio);
-		}
-		alarm(0);
-		free(buf);
-		mq_close(mq);
-		return (0);
-	} else if (pid == -1) {
-		err(1, "fork()");
-	} else {
-		char *buf;
-		int i, j, prio;
-
-		signal(SIGALRM, sighandler);
-		kq = kqueue();
-		EV_SET(&kev, __mq_oshandle(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0);
-		status = kevent(kq, &kev, 1, NULL, 0, NULL);
-		if (status == -1)
-			err(1, "kevent");
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			for (i = 0; i < attr.mq_msgsize; ++i) {
-				buf[i] = i;
-			}
-			alarm(3);
-			status = kevent(kq, NULL, 0, &kev, 1, NULL);
-			if (status != 1)
-				err(1, "child: kevent 2");
-			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
-			if (status) {
-				err(2, "mq_send()");
-			}
-		}
-		free(buf);
-		alarm(3);
-		wait(&status);
-		alarm(0);
-	}
-	status = mq_close(mq);
-	if (status)
-		err(1, "mq_close");
-	mq_unlink(MQNAME);
-	return (0);
-}
diff --git a/tools/regression/mqueue/mqtest5/Makefile b/tools/regression/mqueue/mqtest5/Makefile
deleted file mode 100644
index d94e541..0000000
--- a/tools/regression/mqueue/mqtest5/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PROG=mqtest5
-DPADD=	${LIBRT}
-LDADD=	-lrt
-MAN=
-DEBUG_FLAGS=-g
-
-.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest5/mqtest5.c b/tools/regression/mqueue/mqtest5/mqtest5.c
deleted file mode 100644
index 354a7bb..0000000
--- a/tools/regression/mqueue/mqtest5/mqtest5.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* $FreeBSD$ */
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <fcntl.h>
-#include <mqueue.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define MQNAME	"/mytstqueue5"
-#define LOOPS	1000
-#define PRIO	10
-
-void sighandler(int sig)
-{
-	write(1, "timeout\n", 8);
-	_exit(1);
-}
-
-int main()
-{
-	mqd_t mq;
-	int status;
-	struct mq_attr attr;
-	int pid;
-	sigset_t set;
-	struct sigaction sa;
-	siginfo_t info;
-
-	mq_unlink(MQNAME);
-
-	sigemptyset(&set);
-	sigaddset(&set, SIGRTMIN);
-	sigprocmask(SIG_BLOCK, &set, NULL);
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = SA_SIGINFO;
-	sa.sa_sigaction = (void *) SIG_DFL;
-	sigaction(SIGRTMIN, &sa, NULL);
-
-	attr.mq_maxmsg  = 5;
-	attr.mq_msgsize = 128;
-	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
-	if (mq == (mqd_t)-1)
-		err(1, "mq_open()");
-	status = mq_getattr(mq, &attr);
-	if (status)
-		err(1, "mq_getattr()");
-	pid = fork();
-	if (pid == 0) { /* child */
-		int prio, j, i;
-		char *buf;
-		struct sigevent sigev;
-
-		signal(SIGALRM, sighandler);
-
-		sigev.sigev_notify = SIGEV_SIGNAL;
-		sigev.sigev_signo = SIGRTMIN;
-		sigev.sigev_value.sival_int = 2;
-
-		mq_close(mq);
-		mq = mq_open(MQNAME, O_RDWR | O_NONBLOCK);
-		if (mq == (mqd_t)-1)
-			err(1, "child: mq_open");
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			alarm(3);
-			status = mq_notify(mq, &sigev);
-			if (status)
-				err(1, "child: mq_notify");
-			status = sigwaitinfo(&set, &info);
-			if (status == -1)
-				err(1, "child: sigwaitinfo");
-			if (info.si_value.sival_int != 2)
-				err(1, "child: sival_int");
-			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
-			if (status == -1)
-				err(2, "child: mq_receive");
-			for (i = 0; i < attr.mq_msgsize; ++i)
-				if (buf[i] != i)
-					err(3, "child: message data corrupted");
-			if (prio != PRIO)
-				err(4, "child: priority is incorrect: %d",
-					 prio);
-		}
-		alarm(0);
-		free(buf);
-		mq_close(mq);
-		return (0);
-	} else if (pid == -1) {
-		err(1, "fork()");
-	} else {
-		char *buf;
-		int i, j, prio;
-
-		signal(SIGALRM, sighandler);
-		buf = malloc(attr.mq_msgsize);
-		for (j = 0; j < LOOPS; ++j) {
-			for (i = 0; i < attr.mq_msgsize; ++i) {
-				buf[i] = i;
-			}
-			alarm(3);
-			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
-			if (status) {
-				kill(pid, SIGKILL);
-				err(2, "mq_send()");
-			}
-		}
-		alarm(3);
-		wait(&status);
-		alarm(0);
-	}
-	status = mq_close(mq);
-	if (status)
-		err(1, "mq_close");
-	mq_unlink(MQNAME);
-	return (0);
-}