aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2014-11-03 07:18:42 +0000
committerEnji Cooper <ngie@FreeBSD.org>2014-11-03 07:18:42 +0000
commitfa8093473b4828e734aecc5c7e00541fcabbe080 (patch)
tree8acf039a3e56dac66e639098a8e4cf8a1ec8b9b5
parent324a7026f114e9301d17a82d546d09a1fe043726 (diff)
Notes
-rw-r--r--UPDATING5
-rw-r--r--etc/mtree/BSD.tests.dist34
-rw-r--r--share/doc/Makefile2
-rw-r--r--share/doc/pjdfstest/Makefile8
-rw-r--r--share/doc/pjdfstest/README36
-rw-r--r--tests/sys/Makefile6
-rw-r--r--tests/sys/pjdfstest/Makefile6
-rw-r--r--tests/sys/pjdfstest/pjdfstest/Makefile20
-rw-r--r--tests/sys/pjdfstest/tests/Makefile39
-rw-r--r--tests/sys/pjdfstest/tests/chflags/Makefile18
-rw-r--r--tests/sys/pjdfstest/tests/chmod/Makefile17
-rw-r--r--tests/sys/pjdfstest/tests/chown/Makefile15
-rw-r--r--tests/sys/pjdfstest/tests/conf15
-rw-r--r--tests/sys/pjdfstest/tests/ftruncate/Makefile19
-rw-r--r--tests/sys/pjdfstest/tests/granular/Makefile10
-rw-r--r--tests/sys/pjdfstest/tests/link/Makefile22
-rw-r--r--tests/sys/pjdfstest/tests/mkdir/Makefile17
-rw-r--r--tests/sys/pjdfstest/tests/mkfifo/Makefile17
-rw-r--r--tests/sys/pjdfstest/tests/mknod/Makefile16
-rw-r--r--tests/sys/pjdfstest/tests/open/Makefile29
-rw-r--r--tests/sys/pjdfstest/tests/pjdfstest.test.mk14
-rw-r--r--tests/sys/pjdfstest/tests/rename/Makefile26
-rw-r--r--tests/sys/pjdfstest/tests/rmdir/Makefile20
-rw-r--r--tests/sys/pjdfstest/tests/symlink/Makefile17
-rw-r--r--tests/sys/pjdfstest/tests/truncate/Makefile19
-rw-r--r--tests/sys/pjdfstest/tests/unlink/Makefile18
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc7
27 files changed, 468 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 8fb2bd8645f4..a0af24560d27 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20141102:
+ pjdfstest has been integrated into kyua as an opt-in test suite.
+ Please see share/doc/pjdfstest/README for a more details on how to
+ execute it.
+
20141009:
gperf has been removed from the base system for architectures
that use clang. Ports that require gperf will obtain it from the
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 93ca4df7dedb..9b3d0952fd65 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -17,6 +17,8 @@
doc
atf
..
+ pjdfstest
+ ..
..
..
tests
@@ -143,6 +145,38 @@
..
netinet
..
+ pjdfstest
+ chflags
+ ..
+ chmod
+ ..
+ chown
+ ..
+ ftruncate
+ ..
+ granular
+ ..
+ link
+ ..
+ mkdir
+ ..
+ mkfifo
+ ..
+ mknod
+ ..
+ open
+ ..
+ rename
+ ..
+ rmdir
+ ..
+ symlink
+ ..
+ truncate
+ ..
+ unlink
+ ..
+ ..
..
usr.bin
apply
diff --git a/share/doc/Makefile b/share/doc/Makefile
index fda977f118e0..c752c51b33eb 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -7,10 +7,12 @@ SUBDIR= ${_IPv6} \
${_atf} \
legal \
${_llvm} \
+ ${_pjdfstest} \
${_roffdocs}
.if ${MK_TESTS} != "no"
_atf= atf
+_pjdfstest= pjdfstest
.endif
.if ${MK_CLANG} != "no"
diff --git a/share/doc/pjdfstest/Makefile b/share/doc/pjdfstest/Makefile
new file mode 100644
index 000000000000..21d72f36e353
--- /dev/null
+++ b/share/doc/pjdfstest/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR= ${SHAREDIR}/doc/pjdfstest
+FILES= README
+
+.include <bsd.prog.mk>
diff --git a/share/doc/pjdfstest/README b/share/doc/pjdfstest/README
new file mode 100644
index 000000000000..d09011789e42
--- /dev/null
+++ b/share/doc/pjdfstest/README
@@ -0,0 +1,36 @@
+pjdfstest test suite execution is integrated into kyua. This README describes
+how to use pjdfstest in the default configuration (kyua work directory), and
+with a specific filesystem path.
+
+Method 1. Executing with default configuration (kyua work directory)
+
+ 1. Elevate privileges:
+ % su -
+ 2. cd to the tests directory:
+ % cd /usr/tests/sys/pjdfstest
+ 3. Run kyua:
+ % kyua test
+
+ Executing the commands as shown above will run pjdfstest in the kyua work
+ directory. The kyua work directory defaults to a random generated path under
+ /tmp; please see TMPDIR in kyua(1) for more details on how the temporary path
+ is chosen with kyua.
+
+Method 2. Executing with a specific filesystem path (in this case /mnt)
+
+ 1. Elevate privileges:
+ % su -
+ 2. cd to the tests directory:
+ % cd /usr/tests/sys/pjdfstest
+ 3. Run kyua:
+ % env PJDFSTEST_TEST_PATH=/mnt kyua test
+
+ WARNING: the above method violates the test program isolation algorithm
+ described in kyua(1); as such, $PJDFSTEST_TEST_PATH must be cleaned up after
+ executing the testcases.
+
+ It's highly recommended that $PJDFSTEST_TEST_PATH be pointed to a sandboxed
+ filesystem, e.g. a small UFS-formatted memory disk or ZFS dataset with
+ quotas enabled, so the filesystem can be easily destroyed after the test
+ execution is complete, and the testcases are properly bounded both in terms
+ of time and space.
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 88b558ef31fd..b88af9eb48c0 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -4,9 +4,13 @@
.PATH: ${.CURDIR}/..
+TESTSDIR= ${TESTSBASE}/sys
+
TESTS_SUBDIRS+= kern
TESTS_SUBDIRS+= netinet
-TESTSDIR= ${TESTSBASE}/sys
+
+# Items not integrated into kyua runs by default
+SUBDIR+= pjdfstest
KYUAFILE= yes
diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile
new file mode 100644
index 000000000000..7047811528c2
--- /dev/null
+++ b/tests/sys/pjdfstest/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+SUBDIR+= pjdfstest
+SUBDIR+= tests
+
+.include <bsd.subdir.mk>
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile
new file mode 100644
index 000000000000..c0e82a41dc72
--- /dev/null
+++ b/tests/sys/pjdfstest/pjdfstest/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+TOP= ${.CURDIR:H:H:H:H}
+
+.PATH: ${TOP}/contrib/pjdfstest
+
+BINDIR= ${TESTSBASE}/sys/pjdfstest
+PROG= pjdfstest
+MAN=
+
+CFLAGS= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS
+CFLAGS+= -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT
+CFLAGS+= -DHAS_CONNECTAT
+
+# XXX: the upstream sources need some massaging with how it assigns ngroups in
+# pjdfstest.c
+NO_WERROR=
+WARNS?= 6
+
+.include <bsd.prog.mk>
diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile
new file mode 100644
index 000000000000..248b2095a6b7
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+PJDFSTEST_SRCDIR= ${.CURDIR:H:H:H:H}/contrib/pjdfstest
+
+TESTSDIR= ${TESTSBASE}/sys/pjdfstest
+
+.PATH: ${.CURDIR}
+
+FILESDIR= ${TESTSDIR}
+FILES= conf
+FILES+= misc.sh
+CLEANFILES+= misc.sh misc.sh.tmp
+
+misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh
+ sed -e '\,maindir=,s,maindir=.*,maindir=`dirname $$0`/../,' < ${.ALLSRC} > ${.TARGET}.tmp
+ mv ${.TARGET}.tmp ${.TARGET}
+
+afterinstall: install-tests-symlink
+install-tests-symlink: .PHONY
+ rm -f ${DESTDIR}${TESTSDIR}/tests
+ ${INSTALL_SYMLINK} . ${DESTDIR}${TESTSDIR}/tests
+
+TESTS_SUBDIRS= chflags
+TESTS_SUBDIRS+= chmod
+TESTS_SUBDIRS+= chown
+TESTS_SUBDIRS+= ftruncate
+TESTS_SUBDIRS+= granular
+TESTS_SUBDIRS+= link
+TESTS_SUBDIRS+= mkdir
+TESTS_SUBDIRS+= mkfifo
+TESTS_SUBDIRS+= mknod
+TESTS_SUBDIRS+= open
+TESTS_SUBDIRS+= rename
+TESTS_SUBDIRS+= rmdir
+TESTS_SUBDIRS+= symlink
+TESTS_SUBDIRS+= truncate
+TESTS_SUBDIRS+= unlink
+
+.include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/tests/chflags/Makefile b/tests/sys/pjdfstest/tests/chflags/Makefile
new file mode 100644
index 000000000000..3b6a5265fdd4
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/chflags/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/chmod/Makefile b/tests/sys/pjdfstest/tests/chmod/Makefile
new file mode 100644
index 000000000000..cc0a3bbf1af4
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/chmod/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/chown/Makefile b/tests/sys/pjdfstest/tests/chown/Makefile
new file mode 100644
index 000000000000..665b6538d19e
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/chown/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/conf b/tests/sys/pjdfstest/tests/conf
new file mode 100644
index 000000000000..7a1168efea13
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/conf
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+: ${PJDFSTEST_TEST_PATH=.}
+if ! cd ${PJDFSTEST_TEST_PATH}/; then
+ echo 'Please set PJDFSTEST_TEST_PATH to a valid filesystem path'
+ echo 'Bail out!'
+ exit 1
+fi
+
+GREP=grep
+mountpoint=$(df . | tail -1 | awk '{print $6}')
+fs=$(mount -p | awk '$2 == "'$mountpoint'" { print toupper($3) }')
+os=FreeBSD
diff --git a/tests/sys/pjdfstest/tests/ftruncate/Makefile b/tests/sys/pjdfstest/tests/ftruncate/Makefile
new file mode 100644
index 000000000000..da2ce584d3af
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/ftruncate/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+TAP_TESTS_SH+= 14
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/granular/Makefile b/tests/sys/pjdfstest/tests/granular/Makefile
new file mode 100644
index 000000000000..3f935e4e99ce
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/granular/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/link/Makefile b/tests/sys/pjdfstest/tests/link/Makefile
new file mode 100644
index 000000000000..14c7525689b0
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/link/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+TAP_TESTS_SH+= 14
+TAP_TESTS_SH+= 15
+TAP_TESTS_SH+= 16
+TAP_TESTS_SH+= 17
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/mkdir/Makefile b/tests/sys/pjdfstest/tests/mkdir/Makefile
new file mode 100644
index 000000000000..cc0a3bbf1af4
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/mkdir/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/mkfifo/Makefile b/tests/sys/pjdfstest/tests/mkfifo/Makefile
new file mode 100644
index 000000000000..cc0a3bbf1af4
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/mkfifo/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/mknod/Makefile b/tests/sys/pjdfstest/tests/mknod/Makefile
new file mode 100644
index 000000000000..1eaeaa09818e
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/mknod/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/open/Makefile b/tests/sys/pjdfstest/tests/open/Makefile
new file mode 100644
index 000000000000..bd2f7b5a985d
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/open/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+TAP_TESTS_SH+= 14
+TAP_TESTS_SH+= 15
+TAP_TESTS_SH+= 16
+TAP_TESTS_SH+= 17
+TAP_TESTS_SH+= 18
+TAP_TESTS_SH+= 19
+TAP_TESTS_SH+= 20
+TAP_TESTS_SH+= 21
+TAP_TESTS_SH+= 22
+TAP_TESTS_SH+= 23
+TAP_TESTS_SH+= 24
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/pjdfstest.test.mk b/tests/sys/pjdfstest/tests/pjdfstest.test.mk
new file mode 100644
index 000000000000..3dc784f7eb63
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/pjdfstest.test.mk
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+PJDFSTEST_SRCDIR= ${.CURDIR:H:H:H:H:H}/contrib/pjdfstest
+
+.PATH: ${PJDFSTEST_SRCDIR}/tests/${.CURDIR:T}
+
+TESTSDIR?= ${TESTSBASE}/sys/pjdfstest/${.CURDIR:T}
+
+.for s in ${TAP_TESTS_SH}
+TAP_TESTS_SH_SRC_$s= $s.t
+TEST_METADATA.$s+= required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/tests/rename/Makefile b/tests/sys/pjdfstest/tests/rename/Makefile
new file mode 100644
index 000000000000..7eada047ef15
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/rename/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+TAP_TESTS_SH+= 14
+TAP_TESTS_SH+= 15
+TAP_TESTS_SH+= 16
+TAP_TESTS_SH+= 17
+TAP_TESTS_SH+= 18
+TAP_TESTS_SH+= 19
+TAP_TESTS_SH+= 20
+TAP_TESTS_SH+= 21
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/rmdir/Makefile b/tests/sys/pjdfstest/tests/rmdir/Makefile
new file mode 100644
index 000000000000..301e4e5c33d1
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/rmdir/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+TAP_TESTS_SH+= 14
+TAP_TESTS_SH+= 15
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/symlink/Makefile b/tests/sys/pjdfstest/tests/symlink/Makefile
new file mode 100644
index 000000000000..cc0a3bbf1af4
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/symlink/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/truncate/Makefile b/tests/sys/pjdfstest/tests/truncate/Makefile
new file mode 100644
index 000000000000..da2ce584d3af
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/truncate/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+TAP_TESTS_SH+= 14
+
+.include "../pjdfstest.test.mk"
diff --git a/tests/sys/pjdfstest/tests/unlink/Makefile b/tests/sys/pjdfstest/tests/unlink/Makefile
new file mode 100644
index 000000000000..3b6a5265fdd4
--- /dev/null
+++ b/tests/sys/pjdfstest/tests/unlink/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TAP_TESTS_SH= 00
+TAP_TESTS_SH+= 01
+TAP_TESTS_SH+= 02
+TAP_TESTS_SH+= 03
+TAP_TESTS_SH+= 04
+TAP_TESTS_SH+= 05
+TAP_TESTS_SH+= 06
+TAP_TESTS_SH+= 07
+TAP_TESTS_SH+= 08
+TAP_TESTS_SH+= 09
+TAP_TESTS_SH+= 10
+TAP_TESTS_SH+= 11
+TAP_TESTS_SH+= 12
+TAP_TESTS_SH+= 13
+
+.include "../pjdfstest.test.mk"
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 09c52cbc6962..d0b76ad77cb1 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4068,9 +4068,10 @@ OLD_DIRS+=usr/share/sendmail/cf
OLD_DIRS+=usr/share/sendmail
.endif
-#.if ${MK_SHAREDOCS} == no
-# to be filled in
-#.endif
+.if ${MK_SHAREDOCS} == no
+OLD_FILES+=usr/share/doc/pjdfstest/README
+OLD_DIRS+=usr/share/doc/pjdfstest
+.endif
#.if ${MK_SYSCONS} == no
# to be filled in