Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F154349598
D824.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
11 KB
Referenced Files
None
Subscribers
None
D824.id.diff
View Options
Index: tests/sys/Makefile
===================================================================
--- tests/sys/Makefile
+++ tests/sys/Makefile
@@ -4,10 +4,14 @@
.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
.include <bsd.test.mk>
Index: tests/sys/pjdfstest/Makefile
===================================================================
--- tests/sys/pjdfstest/Makefile
+++ tests/sys/pjdfstest/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/sys/pjdfstest
+
+SUBDIR+= pjdfstest
+SUBDIR+= tests
+
+.include <bsd.test.mk>
Index: tests/sys/pjdfstest/pjdfstest/Makefile
===================================================================
--- tests/sys/pjdfstest/pjdfstest/Makefile
+++ 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>
Index: tests/sys/pjdfstest/tests/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/Makefile
+++ 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>
Index: tests/sys/pjdfstest/tests/chflags/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/chflags/Makefile
+++ tests/sys/pjdfstest/tests/chflags/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
+
+.include "../pjdfstest.test.mk"
+
Index: tests/sys/pjdfstest/tests/chmod/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/chmod/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/chown/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/chown/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/conf
===================================================================
--- tests/sys/pjdfstest/tests/conf
+++ tests/sys/pjdfstest/tests/conf
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $FreeBSD
+
+: ${PJDFSTEST_FILESYSTEM=.}
+if ! cd ${PJDFSTEST_FILESYSTEM}/; then
+ echo 'Please set PJDFSTEST_FILESYSTEM 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
Index: tests/sys/pjdfstest/tests/ftruncate/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/ftruncate/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/granular/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/granular/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/link/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/link/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/mkdir/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/mkdir/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/mkfifo/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/mkfifo/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/mknod/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/mknod/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/open/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/open/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/pjdfstest.test.mk
===================================================================
--- tests/sys/pjdfstest/tests/pjdfstest.test.mk
+++ tests/sys/pjdfstest/tests/pjdfstest.test.mk
@@ -0,0 +1,13 @@
+# $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
+.endfor
+
+.include <bsd.test.mk>
Index: tests/sys/pjdfstest/tests/rename/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/rename/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/rmdir/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/rmdir/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/symlink/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/symlink/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/truncate/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/truncate/Makefile
+++ 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"
Index: tests/sys/pjdfstest/tests/unlink/Makefile
===================================================================
--- tests/sys/pjdfstest/tests/unlink/Makefile
+++ 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"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Apr 29, 12:42 AM (9 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32302212
Default Alt Text
D824.id.diff (11 KB)
Attached To
Mode
D824: Integrate contrib/pjdfstest into the build
Attached
Detach File
Event Timeline
Log In to Comment