svn commit: r300530 - in projects/zfsd/head/tests/sys: . cddl cddl/zfs cddl/zfs/bin cddl/zfs/include cddl/zfs/tests cddl/zfs/tests/acl cddl/zfs/tests/acl/cifs cddl/zfs/tests/acl/nontrivial cddl/zfs...
Alan Somers
asomers at FreeBSD.org
Mon May 23 18:20:20 UTC 2016
Author: asomers
Date: Mon May 23 18:20:15 2016
New Revision: 300530
URL: https://svnweb.freebsd.org/changeset/base/300530
Log:
Update ZFS test suite Makefiles for the package base initiative
* Put a PACKAGE=tests line in every dir that installs files
* replace bsd.own.mk with src.opts.mk
* Replace FILES with ${PACKAGE}FILES
* Condtionalize the whole thing on MK_CDDL and MK_ZFS
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/Makefile
projects/zfsd/head/tests/sys/cddl/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile
Modified: projects/zfsd/head/tests/sys/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,9 +1,12 @@
# $FreeBSD$
+.include <src.opts.mk>
+
TESTSDIR= ${TESTSBASE}/sys
TESTS_SUBDIRS+= acl
TESTS_SUBDIRS+= aio
+TESTS_SUBDIRS+= ${_cddl}
TESTS_SUBDIRS+= fifo
TESTS_SUBDIRS+= file
TESTS_SUBDIRS+= geom
@@ -18,6 +21,10 @@ TESTS_SUBDIRS+= sys
TESTS_SUBDIRS+= vfs
TESTS_SUBDIRS+= vm
+.if ${MK_CDDL} != "no"
+_cddl= cddl
+.endif
+
# Items not integrated into kyua runs by default
SUBDIR+= pjdfstest
Modified: projects/zfsd/head/tests/sys/cddl/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,9 +1,13 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
TESTSDIR= ${TESTSBASE}/sys/cddl
-TESTS_SUBDIRS+= zfs
+TESTS_SUBDIRS+= ${_zfs}
+
+.if ${MK_ZFS} != "no"
+_zfs= zfs
+.endif
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
TESTSDIR= ${TESTSBASE}/sys/cddl/zfs
Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,9 +1,10 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE= tests
MAN=
-BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin
+BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin
SCRIPTSDIR= ${TESTSBASE}/sys/cddl/zfs/bin
SCRIPTS+= bsddisks.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,29 +1,32 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+
+PACKAGE= tests
+
+TESTSDIR=${TESTSBASE}/sys/cddl/zfs/include
STFSUITEDIR=${TESTSBASE}/sys/cddl/zfs
MAN=
FILESDIR= ${TESTSBASE}/sys/cddl/zfs/include
-FILES+= constants.cfg
-FILES+= libremote.kshlib
-FILES+= libsas.kshlib
-FILES+= logapi.kshlib
-FILES+= libtest.kshlib
-FILES+= stf.shlib
-FILES+= testenv.kshlib
+${PACKAGE}FILES+= constants.cfg
+${PACKAGE}FILES+= libremote.kshlib
+${PACKAGE}FILES+= libsas.kshlib
+${PACKAGE}FILES+= logapi.kshlib
+${PACKAGE}FILES+= libtest.kshlib
+${PACKAGE}FILES+= stf.shlib
+${PACKAGE}FILES+= testenv.kshlib
-FILES+= commands.cfg
+${PACKAGE}FILES+= commands.cfg
CLEANFILES+= commands.cfg
commands.cfg: translatecommands.awk commands.txt
awk -v stfsuitedir=${STFSUITEDIR} -f ${.ALLSRC} > ${.TARGET}
-FILES+= default.cfg
+${PACKAGE}FILES+= default.cfg
CLEANFILES+= default.cfg
default.cfg: default.cfg.in
sed "s:%%STFSUITEDIR%%:${STFSUITEDIR}:" ${.ALLSRC} > ${.TARGET}
-TESTSDIR=${TESTSBASE}/sys/cddl/zfs/include
ATF_TESTS_KSH93+= libtest_test
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,7 +1,8 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests
TESTS_SUBDIRS+= acl
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,14 +1,15 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl
FILESDIR=${TESTSDIR}
-FILES+= acl.cfg
-FILES+= acl_common.kshlib
-FILES+= cleanup.ksh
-FILES+= setup.ksh
+${PACKAGE}FILES+= acl.cfg
+${PACKAGE}FILES+= acl_common.kshlib
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= setup.ksh
TESTS_SUBDIRS+= cifs
TESTS_SUBDIRS+= trivial
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,14 +1,15 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl/cifs
FILESDIR=${TESTSDIR}
-FILES+= cifs.kshlib
-FILES+= cifs_attr_001_pos.ksh
-FILES+= cifs_attr_002_pos.ksh
-FILES+= cifs_attr_003_pos.ksh
+${PACKAGE}FILES+= cifs.kshlib
+${PACKAGE}FILES+= cifs_attr_001_pos.ksh
+${PACKAGE}FILES+= cifs_attr_002_pos.ksh
+${PACKAGE}FILES+= cifs_attr_003_pos.ksh
ATF_TESTS_KSH93+= cifs_test
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,36 +1,37 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl/nontrivial
FILESDIR=${TESTSDIR}
-FILES+= zfs_acl_chmod_001_neg.ksh
-FILES+= zfs_acl_chmod_002_pos.ksh
-FILES+= zfs_acl_chmod_aclmode_001_pos.ksh
-FILES+= zfs_acl_chmod_compact_001_pos.ksh
-FILES+= zfs_acl_chmod_delete_001_pos.ksh
-FILES+= zfs_acl_chmod_inherit_001_pos.ksh
-FILES+= zfs_acl_chmod_inherit_002_pos.ksh
-FILES+= zfs_acl_chmod_inherit_003_pos.ksh
-FILES+= zfs_acl_chmod_inherit_004_pos.ksh
-FILES+= zfs_acl_chmod_owner_001_pos.ksh
-FILES+= zfs_acl_chmod_rwacl_001_pos.ksh
-FILES+= zfs_acl_chmod_rwx_001_pos.ksh
-FILES+= zfs_acl_chmod_rwx_002_pos.ksh
-FILES+= zfs_acl_chmod_rwx_003_pos.ksh
-FILES+= zfs_acl_chmod_rwx_004_pos.ksh
-FILES+= zfs_acl_chmod_xattr_001_pos.ksh
-FILES+= zfs_acl_chmod_xattr_002_pos.ksh
-FILES+= zfs_acl_cp_001_pos.ksh
-FILES+= zfs_acl_cp_002_pos.ksh
-FILES+= zfs_acl_cpio_001_pos.ksh
-FILES+= zfs_acl_cpio_002_pos.ksh
-FILES+= zfs_acl_find_001_pos.ksh
-FILES+= zfs_acl_ls_001_pos.ksh
-FILES+= zfs_acl_mv_001_pos.ksh
-FILES+= zfs_acl_tar_001_pos.ksh
-FILES+= zfs_acl_tar_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_001_neg.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_aclmode_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_compact_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_delete_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_inherit_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_inherit_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_inherit_003_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_inherit_004_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_owner_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_rwacl_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_rwx_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_rwx_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_rwx_003_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_rwx_004_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_xattr_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_xattr_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_cp_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_cp_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_cpio_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_cpio_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_find_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_ls_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_mv_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_tar_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_tar_002_pos.ksh
ATF_TESTS_KSH93+= nontrivial_test
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,29 +1,30 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl/trivial
FILESDIR=${TESTSDIR}
-FILES+= zfs_acl_chmod_001_pos.ksh
-FILES+= zfs_acl_compress_001_pos.ksh
-FILES+= zfs_acl_cp_001_pos.ksh
-FILES+= zfs_acl_cp_002_neg.ksh
-FILES+= zfs_acl_cp_003_neg.ksh
-FILES+= zfs_acl_find_001_pos.ksh
-FILES+= zfs_acl_find_002_neg.ksh
-FILES+= zfs_acl_ls_001_pos.ksh
-FILES+= zfs_acl_ls_002_neg.ksh
-FILES+= zfs_acl_mv_001_pos.ksh
-FILES+= zfs_acl_pack_001_pos.ksh
-FILES+= zfs_acl_pax_001_pos.ksh
-FILES+= zfs_acl_pax_002_pos.ksh
-FILES+= zfs_acl_pax_003_pos.ksh
-FILES+= zfs_acl_pax_004_pos.ksh
-FILES+= zfs_acl_pax_005_pos.ksh
-FILES+= zfs_acl_pax_006_pos.ksh
-FILES+= zfs_acl_tar_001_pos.ksh
-FILES+= zfs_acl_tar_002_neg.ksh
+${PACKAGE}FILES+= zfs_acl_chmod_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_compress_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_cp_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_cp_002_neg.ksh
+${PACKAGE}FILES+= zfs_acl_cp_003_neg.ksh
+${PACKAGE}FILES+= zfs_acl_find_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_find_002_neg.ksh
+${PACKAGE}FILES+= zfs_acl_ls_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_ls_002_neg.ksh
+${PACKAGE}FILES+= zfs_acl_mv_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pack_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pax_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pax_002_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pax_003_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pax_004_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pax_005_pos.ksh
+${PACKAGE}FILES+= zfs_acl_pax_006_pos.ksh
+${PACKAGE}FILES+= zfs_acl_tar_001_pos.ksh
+${PACKAGE}FILES+= zfs_acl_tar_002_neg.ksh
ATF_TESTS_KSH93+= trivial_test
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,16 +1,17 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/atime
FILESDIR=${TESTSDIR}
-FILES+= atime.cfg
-FILES+= atime_001_pos.ksh
-FILES+= atime_002_neg.ksh
-FILES+= atime_common.kshlib
-FILES+= cleanup.ksh
-FILES+= setup.ksh
+${PACKAGE}FILES+= atime.cfg
+${PACKAGE}FILES+= atime_001_pos.ksh
+${PACKAGE}FILES+= atime_002_neg.ksh
+${PACKAGE}FILES+= atime_common.kshlib
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= setup.ksh
ATF_TESTS_KSH93+= atime_test
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,20 +1,21 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/bootfs
FILESDIR=${TESTSDIR}
-FILES+= bootfs.cfg
-FILES+= bootfs_001_pos.ksh
-FILES+= bootfs_002_neg.ksh
-FILES+= bootfs_003_pos.ksh
-FILES+= bootfs_004_neg.ksh
-FILES+= bootfs_005_neg.ksh
-FILES+= bootfs_006_pos.ksh
-FILES+= bootfs_007_pos.ksh
-FILES+= bootfs_008_neg.ksh
-FILES+= bootfs_009_neg.ksh
+${PACKAGE}FILES+= bootfs.cfg
+${PACKAGE}FILES+= bootfs_001_pos.ksh
+${PACKAGE}FILES+= bootfs_002_neg.ksh
+${PACKAGE}FILES+= bootfs_003_pos.ksh
+${PACKAGE}FILES+= bootfs_004_neg.ksh
+${PACKAGE}FILES+= bootfs_005_neg.ksh
+${PACKAGE}FILES+= bootfs_006_pos.ksh
+${PACKAGE}FILES+= bootfs_007_pos.ksh
+${PACKAGE}FILES+= bootfs_008_neg.ksh
+${PACKAGE}FILES+= bootfs_009_neg.ksh
ATF_TESTS_KSH93+= bootfs_test
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,26 +1,27 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cache
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= cache_test
-FILES+= cache_005_neg.ksh
-FILES+= cache.kshlib
-FILES+= cleanup.ksh
-FILES+= cache_011_pos.ksh
-FILES+= cache_010_neg.ksh
-FILES+= cache_008_neg.ksh
-FILES+= cache_004_neg.ksh
-FILES+= cache_009_pos.ksh
-FILES+= cache_001_pos.ksh
-FILES+= cache_003_pos.ksh
-FILES+= cache_007_neg.ksh
-FILES+= cache_002_pos.ksh
-FILES+= cache_006_pos.ksh
-FILES+= cache.cfg
-FILES+= setup.ksh
+${PACKAGE}FILES+= cache_005_neg.ksh
+${PACKAGE}FILES+= cache.kshlib
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= cache_011_pos.ksh
+${PACKAGE}FILES+= cache_010_neg.ksh
+${PACKAGE}FILES+= cache_008_neg.ksh
+${PACKAGE}FILES+= cache_004_neg.ksh
+${PACKAGE}FILES+= cache_009_pos.ksh
+${PACKAGE}FILES+= cache_001_pos.ksh
+${PACKAGE}FILES+= cache_003_pos.ksh
+${PACKAGE}FILES+= cache_007_neg.ksh
+${PACKAGE}FILES+= cache_002_pos.ksh
+${PACKAGE}FILES+= cache_006_pos.ksh
+${PACKAGE}FILES+= cache.cfg
+${PACKAGE}FILES+= setup.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,17 +1,18 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cachefile
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= cachefile_test
-FILES+= cachefile_002_pos.ksh
-FILES+= cachefile_003_pos.ksh
-FILES+= cachefile_001_pos.ksh
-FILES+= cachefile.cfg
-FILES+= cachefile.kshlib
-FILES+= cachefile_004_pos.ksh
+${PACKAGE}FILES+= cachefile_002_pos.ksh
+${PACKAGE}FILES+= cachefile_003_pos.ksh
+${PACKAGE}FILES+= cachefile_001_pos.ksh
+${PACKAGE}FILES+= cachefile.cfg
+${PACKAGE}FILES+= cachefile.kshlib
+${PACKAGE}FILES+= cachefile_004_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,14 +1,15 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror
FILESDIR=${TESTSDIR}
-FILES+= setup.ksh
-FILES+= default.cfg
-FILES+= cleanup.ksh
-FILES+= clean_mirror_common.kshlib
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= default.cfg
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= clean_mirror_common.kshlib
TESTS_SUBDIRS+= assertion_001
TESTS_SUBDIRS+= assertion_002
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,12 +1,13 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror/assertion_001
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= assertion_001_test
-FILES+= clean_mirror_001_pos.ksh
+${PACKAGE}FILES+= clean_mirror_001_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,12 +1,13 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror/assertion_002
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= assertion_002_test
-FILES+= clean_mirror_002_pos.ksh
+${PACKAGE}FILES+= clean_mirror_002_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,12 +1,13 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror/assertion_003
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= assertion_003_test
-FILES+= clean_mirror_003_pos.ksh
+${PACKAGE}FILES+= clean_mirror_003_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,12 +1,13 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror/assertion_004
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= assertion_004_test
-FILES+= clean_mirror_004_pos.ksh
+${PACKAGE}FILES+= clean_mirror_004_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,14 +1,15 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root
FILESDIR=${TESTSDIR}
-FILES+= cleanup.ksh
-FILES+= cli.cfg
-FILES+= cli_common.kshlib
-FILES+= setup.ksh
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= cli.cfg
+${PACKAGE}FILES+= cli_common.kshlib
+${PACKAGE}FILES+= setup.ksh
TESTS_SUBDIRS+= zdb
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,15 +1,16 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zdb
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zdb_test
-FILES+= zdb_001_neg.ksh
-FILES+= zdb.cfg
-FILES+= cleanup.ksh
-FILES+= setup.ksh
+${PACKAGE}FILES+= zdb_001_neg.ksh
+${PACKAGE}FILES+= zdb.cfg
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= setup.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,17 +1,18 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_test
-FILES+= zfs_malformed.cfg
-FILES+= zfs_001_neg.ksh
-FILES+= cleanup.ksh
-FILES+= setup.ksh
-FILES+= zfs_003_neg.ksh
-FILES+= zfs_002_pos.ksh
+${PACKAGE}FILES+= zfs_malformed.cfg
+${PACKAGE}FILES+= zfs_001_neg.ksh
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_003_neg.ksh
+${PACKAGE}FILES+= zfs_002_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,23 +1,24 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_clone
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_clone_test
-FILES+= zfs_clone_005_pos.ksh
-FILES+= zfs_clone_008_neg.ksh
-FILES+= cleanup.ksh
-FILES+= zfs_clone_004_pos.ksh
-FILES+= zfs_clone_001_neg.ksh
-FILES+= zfs_clone_009_neg.ksh
-FILES+= zfs_clone_006_pos.ksh
-FILES+= zfs_clone_002_pos.ksh
-FILES+= zfs_clone.cfg
-FILES+= zfs_clone_007_pos.ksh
-FILES+= zfs_clone_003_pos.ksh
-FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_clone_005_pos.ksh
+${PACKAGE}FILES+= zfs_clone_008_neg.ksh
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_clone_004_pos.ksh
+${PACKAGE}FILES+= zfs_clone_001_neg.ksh
+${PACKAGE}FILES+= zfs_clone_009_neg.ksh
+${PACKAGE}FILES+= zfs_clone_006_pos.ksh
+${PACKAGE}FILES+= zfs_clone_002_pos.ksh
+${PACKAGE}FILES+= zfs_clone.cfg
+${PACKAGE}FILES+= zfs_clone_007_pos.ksh
+${PACKAGE}FILES+= zfs_clone_003_pos.ksh
+${PACKAGE}FILES+= setup.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,21 +1,22 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_copies
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_copies_test
-FILES+= zfs_copies.cfg
-FILES+= zfs_copies_001_pos.ksh
-FILES+= zfs_copies_004_neg.ksh
-FILES+= zfs_copies_005_neg.ksh
-FILES+= zfs_copies.kshlib
-FILES+= cleanup.ksh
-FILES+= setup.ksh
-FILES+= zfs_copies_006_pos.ksh
-FILES+= zfs_copies_002_pos.ksh
-FILES+= zfs_copies_003_pos.ksh
+${PACKAGE}FILES+= zfs_copies.cfg
+${PACKAGE}FILES+= zfs_copies_001_pos.ksh
+${PACKAGE}FILES+= zfs_copies_004_neg.ksh
+${PACKAGE}FILES+= zfs_copies_005_neg.ksh
+${PACKAGE}FILES+= zfs_copies.kshlib
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_copies_006_pos.ksh
+${PACKAGE}FILES+= zfs_copies_002_pos.ksh
+${PACKAGE}FILES+= zfs_copies_003_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,29 +1,30 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_create
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_create_test
-FILES+= properties.kshlib
-FILES+= zfs_create_011_pos.ksh
-FILES+= zfs_create_010_neg.ksh
-FILES+= setup.ksh
-FILES+= zfs_create_009_neg.ksh
-FILES+= zfs_create_004_pos.ksh
-FILES+= zfs_create_common.kshlib
-FILES+= zfs_create_008_neg.ksh
-FILES+= zfs_create_005_pos.ksh
-FILES+= zfs_create_001_pos.ksh
-FILES+= zfs_create_007_pos.ksh
-FILES+= zfs_create_003_pos.ksh
-FILES+= zfs_create_012_pos.ksh
-FILES+= cleanup.ksh
-FILES+= zfs_create_013_pos.ksh
-FILES+= zfs_create.cfg
-FILES+= zfs_create_006_pos.ksh
-FILES+= zfs_create_002_pos.ksh
+${PACKAGE}FILES+= properties.kshlib
+${PACKAGE}FILES+= zfs_create_011_pos.ksh
+${PACKAGE}FILES+= zfs_create_010_neg.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_create_009_neg.ksh
+${PACKAGE}FILES+= zfs_create_004_pos.ksh
+${PACKAGE}FILES+= zfs_create_common.kshlib
+${PACKAGE}FILES+= zfs_create_008_neg.ksh
+${PACKAGE}FILES+= zfs_create_005_pos.ksh
+${PACKAGE}FILES+= zfs_create_001_pos.ksh
+${PACKAGE}FILES+= zfs_create_007_pos.ksh
+${PACKAGE}FILES+= zfs_create_003_pos.ksh
+${PACKAGE}FILES+= zfs_create_012_pos.ksh
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_create_013_pos.ksh
+${PACKAGE}FILES+= zfs_create.cfg
+${PACKAGE}FILES+= zfs_create_006_pos.ksh
+${PACKAGE}FILES+= zfs_create_002_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,22 +1,23 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_destroy
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_destroy_test
-FILES+= zfs_destroy_001_pos.ksh
-FILES+= zfs_destroy.cfg
-FILES+= cleanup.ksh
-FILES+= zfs_destroy_004_pos.ksh
-FILES+= zfs_destroy_005_neg.ksh
-FILES+= zfs_destroy_common.kshlib
-FILES+= zfs_destroy_002_pos.ksh
-FILES+= zfs_destroy_007_neg.ksh
-FILES+= setup.ksh
-FILES+= zfs_destroy_003_pos.ksh
-FILES+= zfs_destroy_006_neg.ksh
+${PACKAGE}FILES+= zfs_destroy_001_pos.ksh
+${PACKAGE}FILES+= zfs_destroy.cfg
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_destroy_004_pos.ksh
+${PACKAGE}FILES+= zfs_destroy_005_neg.ksh
+${PACKAGE}FILES+= zfs_destroy_common.kshlib
+${PACKAGE}FILES+= zfs_destroy_002_pos.ksh
+${PACKAGE}FILES+= zfs_destroy_007_neg.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_destroy_003_pos.ksh
+${PACKAGE}FILES+= zfs_destroy_006_neg.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,26 +1,27 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_get
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_get_test
-FILES+= zfs_get_002_pos.ksh
-FILES+= zfs_get_007_neg.ksh
-FILES+= zfs_get_003_pos.ksh
-FILES+= zfs_get_list_d.kshlib
-FILES+= setup.ksh
-FILES+= zfs_get_006_neg.ksh
-FILES+= zfs_get_009_pos.ksh
-FILES+= zfs_get_001_pos.ksh
-FILES+= zfs_get_010_neg.ksh
-FILES+= zfs_get.cfg
-FILES+= cleanup.ksh
-FILES+= zfs_get_004_pos.ksh
-FILES+= zfs_get_008_pos.ksh
-FILES+= zfs_get_common.kshlib
-FILES+= zfs_get_005_neg.ksh
+${PACKAGE}FILES+= zfs_get_002_pos.ksh
+${PACKAGE}FILES+= zfs_get_007_neg.ksh
+${PACKAGE}FILES+= zfs_get_003_pos.ksh
+${PACKAGE}FILES+= zfs_get_list_d.kshlib
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_get_006_neg.ksh
+${PACKAGE}FILES+= zfs_get_009_pos.ksh
+${PACKAGE}FILES+= zfs_get_001_pos.ksh
+${PACKAGE}FILES+= zfs_get_010_neg.ksh
+${PACKAGE}FILES+= zfs_get.cfg
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_get_004_pos.ksh
+${PACKAGE}FILES+= zfs_get_008_pos.ksh
+${PACKAGE}FILES+= zfs_get_common.kshlib
+${PACKAGE}FILES+= zfs_get_005_neg.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,17 +1,18 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_inherit
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_inherit_test
-FILES+= setup.ksh
-FILES+= zfs_inherit_002_neg.ksh
-FILES+= zfs_inherit_003_pos.ksh
-FILES+= cleanup.ksh
-FILES+= zfs_inherit_001_neg.ksh
-FILES+= zfs_inherit.cfg
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_inherit_002_neg.ksh
+${PACKAGE}FILES+= zfs_inherit_003_pos.ksh
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_inherit_001_neg.ksh
+${PACKAGE}FILES+= zfs_inherit.cfg
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,27 +1,28 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_mount
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_mount_test
-FILES+= zfs_mount_004_pos.ksh
-FILES+= zfs_mount_008_pos.ksh
-FILES+= zfs_mount_009_neg.ksh
-FILES+= zfs_mount_010_neg.ksh
-FILES+= zfs_mount_011_neg.ksh
-FILES+= zfs_mount_005_pos.ksh
-FILES+= zfs_mount_001_pos.ksh
-FILES+= zfs_mount.cfg
-FILES+= cleanup.ksh
-FILES+= zfs_mount.kshlib
-FILES+= zfs_mount_007_pos.ksh
-FILES+= zfs_mount_003_pos.ksh
-FILES+= zfs_mount_all_001_pos.ksh
-FILES+= setup.ksh
-FILES+= zfs_mount_006_pos.ksh
-FILES+= zfs_mount_002_pos.ksh
+${PACKAGE}FILES+= zfs_mount_004_pos.ksh
+${PACKAGE}FILES+= zfs_mount_008_pos.ksh
+${PACKAGE}FILES+= zfs_mount_009_neg.ksh
+${PACKAGE}FILES+= zfs_mount_010_neg.ksh
+${PACKAGE}FILES+= zfs_mount_011_neg.ksh
+${PACKAGE}FILES+= zfs_mount_005_pos.ksh
+${PACKAGE}FILES+= zfs_mount_001_pos.ksh
+${PACKAGE}FILES+= zfs_mount.cfg
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_mount.kshlib
+${PACKAGE}FILES+= zfs_mount_007_pos.ksh
+${PACKAGE}FILES+= zfs_mount_003_pos.ksh
+${PACKAGE}FILES+= zfs_mount_all_001_pos.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_mount_006_pos.ksh
+${PACKAGE}FILES+= zfs_mount_002_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,23 +1,24 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_promote
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_promote_test
-FILES+= setup.ksh
-FILES+= zfs_promote_006_neg.ksh
-FILES+= zfs_promote_003_pos.ksh
-FILES+= zfs_promote_common.kshlib
-FILES+= cleanup.ksh
-FILES+= zfs_promote_007_neg.ksh
-FILES+= zfs_promote.cfg
-FILES+= zfs_promote_002_pos.ksh
-FILES+= zfs_promote_004_pos.ksh
-FILES+= zfs_promote_008_pos.ksh
-FILES+= zfs_promote_005_pos.ksh
-FILES+= zfs_promote_001_pos.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_promote_006_neg.ksh
+${PACKAGE}FILES+= zfs_promote_003_pos.ksh
+${PACKAGE}FILES+= zfs_promote_common.kshlib
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_promote_007_neg.ksh
+${PACKAGE}FILES+= zfs_promote.cfg
+${PACKAGE}FILES+= zfs_promote_002_pos.ksh
+${PACKAGE}FILES+= zfs_promote_004_pos.ksh
+${PACKAGE}FILES+= zfs_promote_008_pos.ksh
+${PACKAGE}FILES+= zfs_promote_005_pos.ksh
+${PACKAGE}FILES+= zfs_promote_001_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,15 +1,16 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_property
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_property_test
-FILES+= zfs_set_property_001_pos.ksh
-FILES+= setup.ksh
-FILES+= zfs_property.cfg
-FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_set_property_001_pos.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= zfs_property.cfg
+${PACKAGE}FILES+= cleanup.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,23 +1,24 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_receive
FILESDIR=${TESTSDIR}
ATF_TESTS_KSH93+= zfs_receive_test
-FILES+= zfs_receive_004_neg.ksh
-FILES+= zfs_receive_001_pos.ksh
-FILES+= zfs_receive_009_neg.ksh
-FILES+= zfs_receive_005_neg.ksh
-FILES+= zfs_receive_008_pos.ksh
-FILES+= zfs_receive.cfg
-FILES+= zfs_receive_007_neg.ksh
-FILES+= zfs_receive_002_pos.ksh
-FILES+= zfs_receive_006_pos.ksh
-FILES+= setup.ksh
-FILES+= cleanup.ksh
-FILES+= zfs_receive_003_pos.ksh
+${PACKAGE}FILES+= zfs_receive_004_neg.ksh
+${PACKAGE}FILES+= zfs_receive_001_pos.ksh
+${PACKAGE}FILES+= zfs_receive_009_neg.ksh
+${PACKAGE}FILES+= zfs_receive_005_neg.ksh
+${PACKAGE}FILES+= zfs_receive_008_pos.ksh
+${PACKAGE}FILES+= zfs_receive.cfg
+${PACKAGE}FILES+= zfs_receive_007_neg.ksh
+${PACKAGE}FILES+= zfs_receive_002_pos.ksh
+${PACKAGE}FILES+= zfs_receive_006_pos.ksh
+${PACKAGE}FILES+= setup.ksh
+${PACKAGE}FILES+= cleanup.ksh
+${PACKAGE}FILES+= zfs_receive_003_pos.ksh
.include <bsd.test.mk>
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile Mon May 23 18:16:21 2016 (r300529)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile Mon May 23 18:20:15 2016 (r300530)
@@ -1,28 +1,29 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
+PACKAGE=tests
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list