svn commit: r282137 - head/tests/sys/mqueue

[Garrett Cooper]

Author: ngie
Date: Tue Apr 28 10:56:59 2015
New Revision: 282137
URL: https://svnweb.freebsd.org/changeset/base/282137

Log:
  Use PLAIN_REQUIRE_KERNEL_MODULE to require "mqueuefs"
  
  MFC after: 6 days

Modified:
  head/tests/sys/mqueue/Makefile
  head/tests/sys/mqueue/mqtest1.c
  head/tests/sys/mqueue/mqtest2.c
  head/tests/sys/mqueue/mqtest3.c
  head/tests/sys/mqueue/mqtest4.c
  head/tests/sys/mqueue/mqtest5.c

Modified: head/tests/sys/mqueue/Makefile
==============================================================================
--- head/tests/sys/mqueue/Makefile	Tue Apr 28 10:53:06 2015	(r282136)
+++ head/tests/sys/mqueue/Makefile	Tue Apr 28 10:56:59 2015	(r282137)
@@ -6,6 +6,8 @@ ATF_TESTS_SH=	mqueue_test
 
 BINDIR=		${TESTSDIR}
 
+CFLAGS+=	-I${.CURDIR:H:H}
+
 PROGS+=		mqtest1
 PROGS+=		mqtest2
 PROGS+=		mqtest3

Modified: head/tests/sys/mqueue/mqtest1.c
==============================================================================
--- head/tests/sys/mqueue/mqtest1.c	Tue Apr 28 10:53:06 2015	(r282136)
+++ head/tests/sys/mqueue/mqtest1.c	Tue Apr 28 10:56:59 2015	(r282137)
@@ -7,6 +7,8 @@
 #include <signal.h>
 #include <stdio.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue1"
 
 int
@@ -17,6 +19,8 @@ main(void)
 	mqd_t mq;
 	int status;
 
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
+
 	attr.mq_maxmsg  = 2;
 	attr.mq_msgsize = 100;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);

Modified: head/tests/sys/mqueue/mqtest2.c
==============================================================================
--- head/tests/sys/mqueue/mqtest2.c	Tue Apr 28 10:53:06 2015	(r282136)
+++ head/tests/sys/mqueue/mqtest2.c	Tue Apr 28 10:56:59 2015	(r282137)
@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue2"
 #define LOOPS	1000
 #define PRIO	10
@@ -29,6 +31,8 @@ main(void)
 	int status;
 	pid_t pid;
 	
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
+	
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;

Modified: head/tests/sys/mqueue/mqtest3.c
==============================================================================
--- head/tests/sys/mqueue/mqtest3.c	Tue Apr 28 10:53:06 2015	(r282136)
+++ head/tests/sys/mqueue/mqtest3.c	Tue Apr 28 10:56:59 2015	(r282137)
@@ -11,6 +11,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue3"
 #define LOOPS	1000
 #define PRIO	10
@@ -31,6 +33,8 @@ main(void)
 	mqd_t mq;
 	pid_t pid;
 
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
+
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;

Modified: head/tests/sys/mqueue/mqtest4.c
==============================================================================
--- head/tests/sys/mqueue/mqtest4.c	Tue Apr 28 10:53:06 2015	(r282136)
+++ head/tests/sys/mqueue/mqtest4.c	Tue Apr 28 10:56:59 2015	(r282137)
@@ -12,6 +12,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue4"
 #define LOOPS	1000
 #define PRIO	10
@@ -32,6 +34,8 @@ main(void)
 	int kq, status;
 	pid_t pid;
 
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
+
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;

Modified: head/tests/sys/mqueue/mqtest5.c
==============================================================================
--- head/tests/sys/mqueue/mqtest5.c	Tue Apr 28 10:53:06 2015	(r282136)
+++ head/tests/sys/mqueue/mqtest5.c	Tue Apr 28 10:56:59 2015	(r282137)
@@ -12,6 +12,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue5"
 #define LOOPS	1000
 #define PRIO	10
@@ -34,6 +36,8 @@ main(void)
 	mqd_t mq;
 	pid_t pid;
 
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
+
 	mq_unlink(MQNAME);
 
 	sigemptyset(&set);