From d1662c704b86c3c15281d5293351e3366defdac9 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 13 May 2015 11:12:06 +0000
Subject: [PATCH] MFC r282076,r282104:

r282076:

Integrate tools/regression/mmap into the FreeBSD test suite as
tests/sys/kern/mmap_test

r282104:

Move tests/sys/kern/mmap_test to tests/sys/vm/mmap_test

As jhb noted, the actual mmap(2) implementation is under sys/vm, not
sys/kern/, so the correct logical place is tests/sys/vm/, not
tests/sys/kern/


git-svn-id: svn://svn.freebsd.org/base/stable/10@282853 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/mtree/BSD.tests.dist                                 | 2 ++
 tests/sys/Makefile                                       | 1 +
 tests/sys/vm/Makefile                                    | 7 +++++++
 tools/regression/mmap/mmap.c => tests/sys/vm/mmap_test.c | 0
 tools/regression/mmap/Makefile                           | 6 ------
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 tests/sys/vm/Makefile
 rename tools/regression/mmap/mmap.c => tests/sys/vm/mmap_test.c (100%)
 delete mode 100644 tools/regression/mmap/Makefile

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index be0155165..e575efeb7 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -220,6 +220,8 @@
             unlink
             ..
         ..
+        vm
+        ..
     ..
     usr.bin
         apply
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 5a345c4b8..a1a823933 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -9,6 +9,7 @@ TESTS_SUBDIRS+=		file
 TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		netinet
+TESTS_SUBDIRS+=		vm
 
 # Items not integrated into kyua runs by default
 SUBDIR+=		pjdfstest
diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile
new file mode 100644
index 000000000..1795eefa6
--- /dev/null
+++ b/tests/sys/vm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/vm
+
+TAP_TESTS_C+=	mmap_test
+
+.include <bsd.test.mk>
diff --git a/tools/regression/mmap/mmap.c b/tests/sys/vm/mmap_test.c
similarity index 100%
rename from tools/regression/mmap/mmap.c
rename to tests/sys/vm/mmap_test.c
diff --git a/tools/regression/mmap/Makefile b/tools/regression/mmap/Makefile
deleted file mode 100644
index c9bb5c482..000000000
--- a/tools/regression/mmap/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-PROG=	mmap
-MAN=
-
-.include <bsd.prog.mk>
-- 
2.45.0