From e100f6a2fc03d6f8c268f237f595533ea8044810 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 27 Apr 2015 08:31:43 +0000 Subject: [PATCH] Integrate tools/regression/mqueue into the FreeBSD test suite as tests/sys/mqueue MFC after: 1 week --- etc/mtree/BSD.tests.dist | 2 + tests/sys/Makefile | 1 + tests/sys/mqueue/Makefile | 20 +++++++ .../mqtest1 => tests/sys/mqueue}/mqtest1.c | 3 +- .../mqtest2 => tests/sys/mqueue}/mqtest2.c | 14 +++-- .../mqtest3 => tests/sys/mqueue}/mqtest3.c | 19 ++++--- .../mqtest4 => tests/sys/mqueue}/mqtest4.c | 21 ++++---- .../mqtest5 => tests/sys/mqueue}/mqtest5.c | 14 ++--- tests/sys/mqueue/mqueue_test.sh | 54 +++++++++++++++++++ tools/regression/mqueue/Makefile | 5 -- tools/regression/mqueue/mqtest1/Makefile | 9 ---- tools/regression/mqueue/mqtest2/Makefile | 9 ---- tools/regression/mqueue/mqtest3/Makefile | 9 ---- tools/regression/mqueue/mqtest4/Makefile | 9 ---- tools/regression/mqueue/mqtest5/Makefile | 9 ---- 15 files changed, 118 insertions(+), 80 deletions(-) create mode 100644 tests/sys/mqueue/Makefile rename {tools/regression/mqueue/mqtest1 => tests/sys/mqueue}/mqtest1.c (98%) rename {tools/regression/mqueue/mqtest2 => tests/sys/mqueue}/mqtest2.c (92%) rename {tools/regression/mqueue/mqtest3 => tests/sys/mqueue}/mqtest3.c (94%) rename {tools/regression/mqueue/mqtest4 => tests/sys/mqueue}/mqtest4.c (94%) rename {tools/regression/mqueue/mqtest5 => tests/sys/mqueue}/mqtest5.c (96%) create mode 100755 tests/sys/mqueue/mqueue_test.sh delete mode 100644 tools/regression/mqueue/Makefile delete mode 100644 tools/regression/mqueue/mqtest1/Makefile delete mode 100644 tools/regression/mqueue/mqtest2/Makefile delete mode 100644 tools/regression/mqueue/mqtest3/Makefile delete mode 100644 tools/regression/mqueue/mqtest4/Makefile delete mode 100644 tools/regression/mqueue/mqtest5/Makefile diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 3cd406d86948..355249dba26d 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -364,6 +364,8 @@ .. kqueue .. + mqueue + .. netinet .. opencrypto diff --git a/tests/sys/Makefile b/tests/sys/Makefile index c5ab9c640a10..899cb87cb42f 100644 --- a/tests/sys/Makefile +++ b/tests/sys/Makefile @@ -8,6 +8,7 @@ TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue +TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile new file mode 100644 index 000000000000..230fcb77ab3b --- /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 diff --git a/tools/regression/mqueue/mqtest1/mqtest1.c b/tests/sys/mqueue/mqtest1.c similarity index 98% rename from tools/regression/mqueue/mqtest1/mqtest1.c rename to tests/sys/mqueue/mqtest1.c index 25fc1ba881eb..5590b8736b2a 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 similarity index 92% rename from tools/regression/mqueue/mqtest2/mqtest2.c rename to tests/sys/mqueue/mqtest2.c index bfe6d97fc7dd..aaef43b87c56 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 similarity index 94% rename from tools/regression/mqueue/mqtest3/mqtest3.c rename to tests/sys/mqueue/mqtest3.c index aa47ffac3099..4ee812c6f473 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 similarity index 94% rename from tools/regression/mqueue/mqtest4/mqtest4.c rename to tests/sys/mqueue/mqtest4.c index 80a7f88d9ed5..d249cf68a4cf 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 similarity index 96% rename from tools/regression/mqueue/mqtest5/mqtest5.c rename to tests/sys/mqueue/mqtest5.c index 354a7bb30ceb..7f4d554b8d87 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/tests/sys/mqueue/mqueue_test.sh b/tests/sys/mqueue/mqueue_test.sh new file mode 100755 index 000000000000..dd2469e6924e --- /dev/null +++ b/tests/sys/mqueue/mqueue_test.sh @@ -0,0 +1,54 @@ + +mqtest1_head() +{ + : +} +mqtest1_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest1 +} + +mqtest2_head() +{ + : +} +mqtest2_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest2 +} + +mqtest3_head() +{ + : +} +mqtest3_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest3 +} + +mqtest4_head() +{ + : +} +mqtest4_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest4 +} + +mqtest5_head() +{ + : +} +mqtest5_body() +{ + atf_check -s exit:0 -x $(atf_get_srcdir)/mqtest5 +} + +atf_init_test_cases() +{ + atf_add_test_case mqtest1 + atf_add_test_case mqtest2 + atf_add_test_case mqtest3 + atf_add_test_case mqtest4 + atf_add_test_case mqtest5 +} diff --git a/tools/regression/mqueue/Makefile b/tools/regression/mqueue/Makefile deleted file mode 100644 index a4f386b6839d..000000000000 --- a/tools/regression/mqueue/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -SUBDIR=mqtest1 mqtest2 mqtest3 mqtest4 mqtest5 - -.include diff --git a/tools/regression/mqueue/mqtest1/Makefile b/tools/regression/mqueue/mqtest1/Makefile deleted file mode 100644 index 3a50cee8ffea..000000000000 --- a/tools/regression/mqueue/mqtest1/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -PROG=mqtest1 -DPADD= ${LIBRT} -LDADD= -lrt -MAN= -DEBUG_FLAGS=-g - -.include diff --git a/tools/regression/mqueue/mqtest2/Makefile b/tools/regression/mqueue/mqtest2/Makefile deleted file mode 100644 index 07098543cc15..000000000000 --- a/tools/regression/mqueue/mqtest2/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -PROG=mqtest2 -DPADD= ${LIBRT} -LDADD= -lrt -MAN= -DEBUG_FLAGS=-g - -.include diff --git a/tools/regression/mqueue/mqtest3/Makefile b/tools/regression/mqueue/mqtest3/Makefile deleted file mode 100644 index 514cbacb1708..000000000000 --- a/tools/regression/mqueue/mqtest3/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -PROG=mqtest3 -DPADD= ${LIBRT} -LDADD= -lrt -MAN= -DEBUG_FLAGS=-g - -.include diff --git a/tools/regression/mqueue/mqtest4/Makefile b/tools/regression/mqueue/mqtest4/Makefile deleted file mode 100644 index 781d76da220b..000000000000 --- a/tools/regression/mqueue/mqtest4/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -PROG=mqtest4 -DPADD= ${LIBRT} -LDADD= -lrt -MAN= -DEBUG_FLAGS=-g - -.include diff --git a/tools/regression/mqueue/mqtest5/Makefile b/tools/regression/mqueue/mqtest5/Makefile deleted file mode 100644 index d94e541f81f3..000000000000 --- a/tools/regression/mqueue/mqtest5/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -PROG=mqtest5 -DPADD= ${LIBRT} -LDADD= -lrt -MAN= -DEBUG_FLAGS=-g - -.include