13 files changed, 63 insertions, 80 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 3a7ecf7..47678de 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -358,6 +358,8 @@
         ..
         kqueue
         ..
+        mqueue
+        ..
         netinet
         ..
         opencrypto
diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
new file mode 100644
index 0000000..230fcb7
--- /dev/null
+++ b/tests/sys/mqueue/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/mqueue
+
+ATF_TESTS_SH=	mqueue_test
+
+BINDIR=		${TESTSDIR}
+
+PROGS+=		mqtest1
+PROGS+=		mqtest2
+PROGS+=		mqtest3
+PROGS+=		mqtest4
+PROGS+=		mqtest5
+
+LDADD+=		-lrt
+DPADD+=		${LIBRT}
+
+WARNS?=		6
+
+.include <bsd.test.mk>
diff --git a/tools/regression/mqueue/mqtest1/mqtest1.c b/tests/sys/mqueue/mqtest1.c
index 25fc1ba..5590b87 100644
--- a/tools/regression/mqueue/mqtest1/mqtest1.c
+++ b/tests/sys/mqueue/mqtest1.c
@@ -9,7 +9,8 @@
 
 #define MQNAME	"/mytstqueue1"
 
-int main()
+int
+main(void)
 {
 	struct mq_attr attr, attr2;
 	struct sigevent sigev;
diff --git a/tools/regression/mqueue/mqtest2/mqtest2.c b/tests/sys/mqueue/mqtest2.c
index bfe6d97..aaef43b 100644
--- a/tools/regression/mqueue/mqtest2/mqtest2.c
+++ b/tests/sys/mqueue/mqtest2.c
@@ -14,17 +14,20 @@
 #define LOOPS	1000
 #define PRIO	10
 
-void alarmhandler(int sig)
+static void
+alarmhandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
-int main()
+int
+main(void)
 {
 	struct mq_attr attr;
 	mqd_t mq;
-	int status, pid;
+	int status;
+	pid_t pid;
 	
 	mq_unlink(MQNAME);
 
@@ -38,8 +41,9 @@ int main()
 		err(1, "mq_getattr");
 	pid = fork();
 	if (pid == 0) { /* child */
-		int prio, j, i;
 		char *buf;
+		int j, i;
+		unsigned int prio;
 
 		mq_close(mq);
 
@@ -69,7 +73,7 @@ int main()
 		err(1, "fork()");
 	} else {
 		char *buf;
-		int i, j, prio;
+		int i, j;
 
 		signal(SIGALRM, alarmhandler);
 		buf = malloc(attr.mq_msgsize);
diff --git a/tools/regression/mqueue/mqtest3/mqtest3.c b/tests/sys/mqueue/mqtest3.c
index aa47ffa..4ee812c 100644
--- a/tools/regression/mqueue/mqtest3/mqtest3.c
+++ b/tests/sys/mqueue/mqtest3.c
@@ -15,19 +15,21 @@
 #define LOOPS	1000
 #define PRIO	10
 
-void sighandler(int sig)
+static void
+sighandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
-int main()
+int
+main(void)
 {
-	mqd_t mq;
-	int status;
-	struct mq_attr attr;
-	int pid;
 	fd_set set;
+	struct mq_attr attr;
+	int status;
+	mqd_t mq;
+	pid_t pid;
 
 	mq_unlink(MQNAME);
 
@@ -42,8 +44,9 @@ int main()
 	
 	pid = fork();
 	if (pid == 0) { /* child */
-		int prio, j, i;
 		char *buf;
+		int j, i;
+		unsigned int prio;
 
 		mq_close(mq);
 
@@ -77,7 +80,7 @@ int main()
 		err(1, "fork()");
 	} else {
 		char *buf;
-		int i, j, prio;
+		int i, j;
 
 		signal(SIGALRM, sighandler);
 		buf = malloc(attr.mq_msgsize);
diff --git a/tools/regression/mqueue/mqtest4/mqtest4.c b/tests/sys/mqueue/mqtest4.c
index 80a7f88..d249cf6 100644
--- a/tools/regression/mqueue/mqtest4/mqtest4.c
+++ b/tests/sys/mqueue/mqtest4.c
@@ -16,21 +16,21 @@
 #define LOOPS	1000
 #define PRIO	10
 
-void sighandler(int sig)
+static void
+sighandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
-int main()
+int
+main(void)
 {
-	mqd_t mq;
-	int status;
-	struct mq_attr attr;
-	int pid;
-	fd_set set;
-	int kq;
 	struct kevent kev;
+	struct mq_attr attr;
+	mqd_t mq;
+	int kq, status;
+	pid_t pid;
 
 	mq_unlink(MQNAME);
 
@@ -44,8 +44,9 @@ int main()
 		err(1, "mq_getattr()");
 	pid = fork();
 	if (pid == 0) { /* child */
-		int prio, j, i;
 		char *buf;
+		int j, i;
+		unsigned int prio;
 
 		mq_close(mq);
 		kq = kqueue();
@@ -80,7 +81,7 @@ int main()
 		err(1, "fork()");
 	} else {
 		char *buf;
-		int i, j, prio;
+		int i, j;
 
 		signal(SIGALRM, sighandler);
 		kq = kqueue();
diff --git a/tools/regression/mqueue/mqtest5/mqtest5.c b/tests/sys/mqueue/mqtest5.c
index 354a7bb..7f4d554 100644
--- a/tools/regression/mqueue/mqtest5/mqtest5.c
+++ b/tests/sys/mqueue/mqtest5.c
@@ -16,21 +16,23 @@
 #define LOOPS	1000
 #define PRIO	10
 
-void sighandler(int sig)
+static void
+sighandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
-int main()
+int
+main(void)
 {
-	mqd_t mq;
 	int status;
 	struct mq_attr attr;
-	int pid;
-	sigset_t set;
 	struct sigaction sa;
+	sigset_t set;
 	siginfo_t info;
+	mqd_t mq;
+	pid_t pid;
 
 	mq_unlink(MQNAME);
 
@@ -95,7 +97,7 @@ int main()
 		err(1, "fork()");
 	} else {
 		char *buf;
-		int i, j, prio;
+		int i, j;
 
 		signal(SIGALRM, sighandler);
 		buf = malloc(attr.mq_msgsize);
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/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/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/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/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>