summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-05-13 11:12:06 +0000
committerngie <ngie@FreeBSD.org>2015-05-13 11:12:06 +0000
commit8071140ed5634ae2c5fbfc741e59327f45e53ff1 (patch)
tree600e671b4d6bbe256cf930359250df6fdd197407
parent7f277f26206473f53c9131167ead792492aef18e (diff)
downloadFreeBSD-src-8071140ed5634ae2c5fbfc741e59327f45e53ff1.zip
FreeBSD-src-8071140ed5634ae2c5fbfc741e59327f45e53ff1.tar.gz
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/
-rw-r--r--etc/mtree/BSD.tests.dist2
-rw-r--r--tests/sys/Makefile1
-rw-r--r--tests/sys/vm/Makefile7
-rw-r--r--tests/sys/vm/mmap_test.c (renamed from tools/regression/mmap/mmap.c)0
-rw-r--r--tools/regression/mmap/Makefile6
5 files changed, 10 insertions, 6 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index be01551..e575efe 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 5a345c4..a1a8239 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 0000000..1795eef
--- /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
index 7591a09..7591a09 100644
--- a/tools/regression/mmap/mmap.c
+++ b/tests/sys/vm/mmap_test.c
diff --git a/tools/regression/mmap/Makefile b/tools/regression/mmap/Makefile
deleted file mode 100644
index c9bb5c4..0000000
--- a/tools/regression/mmap/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-PROG= mmap
-MAN=
-
-.include <bsd.prog.mk>
OpenPOWER on IntegriCloud