Index: projects/zfsd/head/tests/sys/Makefile =================================================================== --- projects/zfsd/head/tests/sys/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/Makefile (revision 300530) @@ -1,24 +1,31 @@ # $FreeBSD$ +.include + TESTSDIR= ${TESTSBASE}/sys TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= aio +TESTS_SUBDIRS+= ${_cddl} TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file TESTS_SUBDIRS+= geom TESTS_SUBDIRS+= kern TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mac TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto TESTS_SUBDIRS+= posixshm 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 .include Index: projects/zfsd/head/tests/sys/cddl/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/Makefile (revision 300530) @@ -1,9 +1,13 @@ # $FreeBSD$ -.include +.include TESTSDIR= ${TESTSBASE}/sys/cddl -TESTS_SUBDIRS+= zfs +TESTS_SUBDIRS+= ${_zfs} + +.if ${MK_ZFS} != "no" +_zfs= zfs +.endif .include Index: projects/zfsd/head/tests/sys/cddl/zfs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/Makefile (revision 300530) @@ -1,11 +1,11 @@ # $FreeBSD$ -.include +.include TESTSDIR= ${TESTSBASE}/sys/cddl/zfs TESTS_SUBDIRS+= tests include SUBDIR+= bin .include Index: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile (revision 300530) @@ -1,60 +1,61 @@ # $FreeBSD$ -.include +.include +PACKAGE= tests MAN= -BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin +BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin SCRIPTSDIR= ${TESTSBASE}/sys/cddl/zfs/bin SCRIPTS+= bsddisks.ksh SCRIPTS+= df.ksh SCRIPTS+= dircmp.ksh SCRIPTS+= dumpadm.ksh SCRIPTS+= ff.ksh SCRIPTS+= fmadm.ksh SCRIPTS+= fmdump.ksh SCRIPTS+= format.ksh SCRIPTS+= groupadd.ksh SCRIPTS+= groupdel.ksh SCRIPTS+= groupmod.ksh SCRIPTS+= groupshow.ksh SCRIPTS+= svcs.ksh SCRIPTS+= swap.ksh SCRIPTS+= testenv.ksh SCRIPTS+= useradd.ksh SCRIPTS+= userdel.ksh SCRIPTS+= usermod.ksh SCRIPTS+= zfs.ksh SCRIPTS+= zfs_crypto.ksh SCRIPTS+= zfs_version.ksh SCRIPTS+= zlogin.ksh SCRIPTS+= zoneadm.ksh SCRIPTS+= zonecfg.ksh SCRIPTS+= zpool.ksh SCRIPTS+= zpool_bsd.ksh SCRIPTS+= zpool_smi.ksh SCRIPTS+= zpool_version.ksh PROGS+= chg_usr_exec # Not ported to FreeBSD # PROGRS+= devname2devid PROGS+= dir_rd_update PROGS+= file_check PROGS+= file_trunc PROGS+= file_write PROGS+= largest_file PROGS+= mktree PROGS+= mmapwrite PROGS+= randfree_file PROGS+= readmmap PROGS+= rename_dir PROGS+= rm_lnkcnt_zero_file .for p in ${PROGS} SRCS.$p= $p.c .endfor LIBADD.mmapwrite+= pthread LIBADD.rm_lnkcnt_zero_file+= pthread .include Index: projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile (revision 300530) @@ -1,29 +1,32 @@ # $FreeBSD$ -.include +.include +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 Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile (revision 300530) @@ -1,93 +1,94 @@ # $FreeBSD$ -.include +.include +PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= atime TESTS_SUBDIRS+= bootfs TESTS_SUBDIRS+= cache TESTS_SUBDIRS+= cachefile TESTS_SUBDIRS+= clean_mirror TESTS_SUBDIRS+= cli_root TESTS_SUBDIRS+= cli_user TESTS_SUBDIRS+= compression TESTS_SUBDIRS+= ctime TESTS_SUBDIRS+= delegate TESTS_SUBDIRS+= devices TESTS_SUBDIRS+= exec TESTS_SUBDIRS+= grow_pool TESTS_SUBDIRS+= grow_replicas TESTS_SUBDIRS+= history TESTS_SUBDIRS+= hotplug TESTS_SUBDIRS+= hotspare TESTS_SUBDIRS+= inheritance # Not yet ported to FreeBSD # TESTS_SUBDIRS+= interop TESTS_SUBDIRS+= inuse # Not yet ported to FreeBSD # TESTS_SUBDIRS+= iscsi TESTS_SUBDIRS+= large_files # Not yet ported to FreeBSD # TESTS_SUBDIRS+= largest_pool # link_count is not yet ported to FreeBSD. I'm not sure what its purpose is. # The assertion message contradicts with the log_fail message. # TESTS_SUBDIRS+= link_count TESTS_SUBDIRS+= mdb TESTS_SUBDIRS+= migration TESTS_SUBDIRS+= mmap TESTS_SUBDIRS+= mount TESTS_SUBDIRS+= mv_files TESTS_SUBDIRS+= nestedfs TESTS_SUBDIRS+= no_space TESTS_SUBDIRS+= online_offline TESTS_SUBDIRS+= pool_names TESTS_SUBDIRS+= poolversion TESTS_SUBDIRS+= privilege TESTS_SUBDIRS+= quota TESTS_SUBDIRS+= redundancy TESTS_SUBDIRS+= refquota TESTS_SUBDIRS+= refreserv # Not yet ported to FreeBSD # TESTS_SUBDIRS+= remote # Broken on every OS # TESTS_SUBDIRS+= rename_dirs TESTS_SUBDIRS+= replacement TESTS_SUBDIRS+= reservation TESTS_SUBDIRS+= rootpool # Not yet ported to FreeBSD # TESTS_SUBDIRS+= rsend TESTS_SUBDIRS+= sas_phy_thrash TESTS_SUBDIRS+= scrub_mirror TESTS_SUBDIRS+= slog TESTS_SUBDIRS+= snapshot TESTS_SUBDIRS+= snapused TESTS_SUBDIRS+= sparse TESTS_SUBDIRS+= threadsappend TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= txg_integrity TESTS_SUBDIRS+= userquota TESTS_SUBDIRS+= utils_test TESTS_SUBDIRS+= write_dirs # Not yet ported to FreeBSD # TESTS_SUBDIRS+= xattr TESTS_SUBDIRS+= zfsd TESTS_SUBDIRS+= zil # Not yet ported to FreeBSD # TESTS_SUBDIRS+= zinject # Not yet ported to FreeBSD # TESTS_SUBDIRS+= zones TESTS_SUBDIRS+= zvol TESTS_SUBDIRS+= zvol_thrash # This is primarily useful for identifying which test a testid corresponds to. # Sometimes all you might have is a pool name like 'testpool.1316'. testids: for i in `find ${.CURDIR} -name '*.sh' | xargs grep '^atf_test_case '|awk '{print $$2}'`; do \ echo "$${i}: $$(echo $$i | cksum -o 2 | cut -d" " -f1)"; \ done .PHONY: testids .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +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 TESTS_SUBDIRS+= nontrivial .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +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 .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile (revision 300530) @@ -1,37 +1,38 @@ # $FreeBSD$ -.include +.include +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 .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/Makefile (revision 300530) @@ -1,30 +1,31 @@ # $FreeBSD$ -.include +.include +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 .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +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 .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/Makefile (revision 300530) @@ -1,21 +1,22 @@ # $FreeBSD$ -.include +.include +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 .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/Makefile (revision 300530) @@ -1,26 +1,27 @@ # $FreeBSD$ -.include +.include +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 Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +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 Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +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 TESTS_SUBDIRS+= assertion_003 TESTS_SUBDIRS+= assertion_004 .include Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/Makefile (revision 300530) @@ -1,12 +1,13 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/Makefile (revision 300530) @@ -1,12 +1,13 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/Makefile (revision 300530) @@ -1,12 +1,13 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/Makefile (revision 300530) @@ -1,12 +1,13 @@ # $FreeBSD$ -.include +.include +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 Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile (revision 300530) @@ -1,58 +1,59 @@ # $FreeBSD$ -.include +.include +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 TESTS_SUBDIRS+= zfs TESTS_SUBDIRS+= zfs_clone TESTS_SUBDIRS+= zfs_copies TESTS_SUBDIRS+= zfs_create TESTS_SUBDIRS+= zfs_destroy TESTS_SUBDIRS+= zfs_get TESTS_SUBDIRS+= zfs_inherit TESTS_SUBDIRS+= zfs_mount TESTS_SUBDIRS+= zfs_promote TESTS_SUBDIRS+= zfs_property TESTS_SUBDIRS+= zfs_receive TESTS_SUBDIRS+= zfs_rename TESTS_SUBDIRS+= zfs_reservation TESTS_SUBDIRS+= zfs_rollback TESTS_SUBDIRS+= zfs_send TESTS_SUBDIRS+= zfs_set TESTS_SUBDIRS+= zfs_share TESTS_SUBDIRS+= zfs_snapshot TESTS_SUBDIRS+= zfs_unshare TESTS_SUBDIRS+= zfs_unmount TESTS_SUBDIRS+= zfs_upgrade TESTS_SUBDIRS+= zpool TESTS_SUBDIRS+= zpool_add TESTS_SUBDIRS+= zpool_attach TESTS_SUBDIRS+= zpool_clear TESTS_SUBDIRS+= zpool_create TESTS_SUBDIRS+= zpool_destroy TESTS_SUBDIRS+= zpool_detach TESTS_SUBDIRS+= zpool_expand TESTS_SUBDIRS+= zpool_export TESTS_SUBDIRS+= zpool_get TESTS_SUBDIRS+= zpool_history TESTS_SUBDIRS+= zpool_import TESTS_SUBDIRS+= zpool_offline TESTS_SUBDIRS+= zpool_online TESTS_SUBDIRS+= zpool_remove TESTS_SUBDIRS+= zpool_replace TESTS_SUBDIRS+= zpool_set TESTS_SUBDIRS+= zpool_scrub TESTS_SUBDIRS+= zpool_status TESTS_SUBDIRS+= zpool_upgrade .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +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 Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile (revision 300530) @@ -1,23 +1,24 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile (revision 300530) @@ -1,21 +1,22 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile (revision 300530) @@ -1,29 +1,30 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile (revision 300530) @@ -1,22 +1,23 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile (revision 300530) @@ -1,26 +1,27 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile (revision 300530) @@ -1,27 +1,28 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile (revision 300530) @@ -1,23 +1,24 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile (revision 300530) @@ -1,23 +1,24 @@ # $FreeBSD$ -.include +.include +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 Index: 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 (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile (revision 300530) @@ -1,28 +1,29 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_rename FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_rename_test -FILES+= zfs_rename_002_pos.ksh -FILES+= zfs_rename_006_pos.ksh -FILES+= zfs_rename_012_neg.ksh -FILES+= zfs_rename.cfg -FILES+= zfs_rename_013_pos.ksh -FILES+= zfs_rename_003_pos.ksh -FILES+= zfs_rename_007_pos.ksh -FILES+= zfs_rename_001_pos.ksh -FILES+= zfs_rename_004_neg.ksh -FILES+= zfs_rename_008_pos.ksh -FILES+= zfs_rename_009_neg.ksh -FILES+= setup.ksh -FILES+= zfs_rename_005_neg.ksh -FILES+= zfs_rename.kshlib -FILES+= zfs_rename_010_neg.ksh -FILES+= zfs_rename_011_pos.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_rename_002_pos.ksh +${PACKAGE}FILES+= zfs_rename_006_pos.ksh +${PACKAGE}FILES+= zfs_rename_012_neg.ksh +${PACKAGE}FILES+= zfs_rename.cfg +${PACKAGE}FILES+= zfs_rename_013_pos.ksh +${PACKAGE}FILES+= zfs_rename_003_pos.ksh +${PACKAGE}FILES+= zfs_rename_007_pos.ksh +${PACKAGE}FILES+= zfs_rename_001_pos.ksh +${PACKAGE}FILES+= zfs_rename_004_neg.ksh +${PACKAGE}FILES+= zfs_rename_008_pos.ksh +${PACKAGE}FILES+= zfs_rename_009_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_rename_005_neg.ksh +${PACKAGE}FILES+= zfs_rename.kshlib +${PACKAGE}FILES+= zfs_rename_010_neg.ksh +${PACKAGE}FILES+= zfs_rename_011_pos.ksh +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_reservation FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_reservation_test -FILES+= zfs_reservation.cfg -FILES+= zfs_reservation_001_pos.ksh -FILES+= zfs_reservation_002_pos.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_reservation.cfg +${PACKAGE}FILES+= zfs_reservation_001_pos.ksh +${PACKAGE}FILES+= zfs_reservation_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_rollback FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_rollback_test -FILES+= zfs_rollback_003_neg.ksh -FILES+= zfs_rollback_002_pos.ksh -FILES+= zfs_rollback_common.kshlib -FILES+= cleanup.ksh -FILES+= zfs_rollback_004_neg.ksh -FILES+= zfs_rollback_001_pos.ksh -FILES+= setup.ksh -FILES+= zfs_rollback.cfg +${PACKAGE}FILES+= zfs_rollback_003_neg.ksh +${PACKAGE}FILES+= zfs_rollback_002_pos.ksh +${PACKAGE}FILES+= zfs_rollback_common.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_rollback_004_neg.ksh +${PACKAGE}FILES+= zfs_rollback_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_rollback.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_send FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_send_test -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zfs_send_003_pos.ksh -FILES+= zfs_send_002_pos.ksh -FILES+= zfs_send.cfg -FILES+= zfs_send_001_pos.ksh -FILES+= zfs_send_004_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_send_003_pos.ksh +${PACKAGE}FILES+= zfs_send_002_pos.ksh +${PACKAGE}FILES+= zfs_send.cfg +${PACKAGE}FILES+= zfs_send_001_pos.ksh +${PACKAGE}FILES+= zfs_send_004_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile (revision 300530) @@ -1,41 +1,42 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_set FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_set_test -FILES+= zfs_set_common.kshlib -FILES+= onoffs_001_pos.ksh -FILES+= setup.ksh -FILES+= mountpoint_001_pos.ksh -FILES+= share_mount_001_neg.ksh -FILES+= user_property_004_pos.ksh -FILES+= canmount_002_pos.ksh -FILES+= readonly_001_pos.ksh -FILES+= zfs_set_001_neg.ksh -FILES+= user_property_001_pos.ksh -FILES+= snapdir_001_pos.ksh -FILES+= canmount_003_pos.ksh -FILES+= reservation_001_neg.ksh -FILES+= compression_001_pos.ksh -FILES+= cache_001_pos.ksh -FILES+= zfs_set_003_neg.ksh -FILES+= canmount_001_pos.ksh -FILES+= property_alias_001_pos.ksh -FILES+= version_001_neg.ksh -FILES+= zfs_set.cfg -FILES+= cache_002_neg.ksh -FILES+= mountpoint_002_pos.ksh -FILES+= cleanup.ksh -FILES+= checksum_001_pos.ksh -FILES+= mountpoint_003_pos.ksh -FILES+= user_property_002_pos.ksh -FILES+= zfs_set_002_neg.ksh -FILES+= user_property_003_neg.ksh -FILES+= ro_props_001_pos.ksh -FILES+= canmount_004_pos.ksh +${PACKAGE}FILES+= zfs_set_common.kshlib +${PACKAGE}FILES+= onoffs_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= mountpoint_001_pos.ksh +${PACKAGE}FILES+= share_mount_001_neg.ksh +${PACKAGE}FILES+= user_property_004_pos.ksh +${PACKAGE}FILES+= canmount_002_pos.ksh +${PACKAGE}FILES+= readonly_001_pos.ksh +${PACKAGE}FILES+= zfs_set_001_neg.ksh +${PACKAGE}FILES+= user_property_001_pos.ksh +${PACKAGE}FILES+= snapdir_001_pos.ksh +${PACKAGE}FILES+= canmount_003_pos.ksh +${PACKAGE}FILES+= reservation_001_neg.ksh +${PACKAGE}FILES+= compression_001_pos.ksh +${PACKAGE}FILES+= cache_001_pos.ksh +${PACKAGE}FILES+= zfs_set_003_neg.ksh +${PACKAGE}FILES+= canmount_001_pos.ksh +${PACKAGE}FILES+= property_alias_001_pos.ksh +${PACKAGE}FILES+= version_001_neg.ksh +${PACKAGE}FILES+= zfs_set.cfg +${PACKAGE}FILES+= cache_002_neg.ksh +${PACKAGE}FILES+= mountpoint_002_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= checksum_001_pos.ksh +${PACKAGE}FILES+= mountpoint_003_pos.ksh +${PACKAGE}FILES+= user_property_002_pos.ksh +${PACKAGE}FILES+= zfs_set_002_neg.ksh +${PACKAGE}FILES+= user_property_003_neg.ksh +${PACKAGE}FILES+= ro_props_001_pos.ksh +${PACKAGE}FILES+= canmount_004_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile (revision 300530) @@ -1,25 +1,26 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_share FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_share_test -FILES+= zfs_share_003_pos.ksh -FILES+= zfs_share_006_pos.ksh -FILES+= zfs_share_002_pos.ksh -FILES+= zfs_share_007_neg.ksh -FILES+= zfs_share.cfg -FILES+= zfs_share_004_pos.ksh -FILES+= zfs_share_009_neg.ksh -FILES+= zfs_share_010_neg.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= zfs_share_009_pos.ksh -FILES+= zfs_share_005_pos.ksh -FILES+= zfs_share_001_pos.ksh -FILES+= zfs_share_008_neg.ksh +${PACKAGE}FILES+= zfs_share_003_pos.ksh +${PACKAGE}FILES+= zfs_share_006_pos.ksh +${PACKAGE}FILES+= zfs_share_002_pos.ksh +${PACKAGE}FILES+= zfs_share_007_neg.ksh +${PACKAGE}FILES+= zfs_share.cfg +${PACKAGE}FILES+= zfs_share_004_pos.ksh +${PACKAGE}FILES+= zfs_share_009_neg.ksh +${PACKAGE}FILES+= zfs_share_010_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_share_009_pos.ksh +${PACKAGE}FILES+= zfs_share_005_pos.ksh +${PACKAGE}FILES+= zfs_share_001_pos.ksh +${PACKAGE}FILES+= zfs_share_008_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile (revision 300530) @@ -1,21 +1,22 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_snapshot FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_snapshot_test -FILES+= cleanup.ksh -FILES+= zfs_snapshot_005_neg.ksh -FILES+= zfs_snapshot_001_neg.ksh -FILES+= zfs_snapshot_004_neg.ksh -FILES+= setup.ksh -FILES+= zfs_snapshot_002_neg.ksh -FILES+= zfs_snapshot_006_pos.ksh -FILES+= zfs_snapshot_007_neg.ksh -FILES+= zfs_snapshot_003_neg.ksh -FILES+= zfs_snapshot.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_snapshot_005_neg.ksh +${PACKAGE}FILES+= zfs_snapshot_001_neg.ksh +${PACKAGE}FILES+= zfs_snapshot_004_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_snapshot_002_neg.ksh +${PACKAGE}FILES+= zfs_snapshot_006_pos.ksh +${PACKAGE}FILES+= zfs_snapshot_007_neg.ksh +${PACKAGE}FILES+= zfs_snapshot_003_neg.ksh +${PACKAGE}FILES+= zfs_snapshot.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile (revision 300530) @@ -1,25 +1,26 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_unmount FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unmount_test -FILES+= zfs_unmount_003_pos.ksh -FILES+= zfs_unmount_all_001_pos.ksh -FILES+= zfs_unmount_006_pos.ksh -FILES+= zfs_unmount_002_pos.ksh -FILES+= zfs_unmount_007_neg.ksh -FILES+= zfs_unmount.cfg -FILES+= zfs_unmount_004_pos.ksh -FILES+= zfs_unmount_009_pos.ksh -FILES+= zfs_unmount_005_pos.ksh -FILES+= zfs_unmount_001_pos.ksh -FILES+= zfs_unmount_008_neg.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= zfs_unmount.kshlib +${PACKAGE}FILES+= zfs_unmount_003_pos.ksh +${PACKAGE}FILES+= zfs_unmount_all_001_pos.ksh +${PACKAGE}FILES+= zfs_unmount_006_pos.ksh +${PACKAGE}FILES+= zfs_unmount_002_pos.ksh +${PACKAGE}FILES+= zfs_unmount_007_neg.ksh +${PACKAGE}FILES+= zfs_unmount.cfg +${PACKAGE}FILES+= zfs_unmount_004_pos.ksh +${PACKAGE}FILES+= zfs_unmount_009_pos.ksh +${PACKAGE}FILES+= zfs_unmount_005_pos.ksh +${PACKAGE}FILES+= zfs_unmount_001_pos.ksh +${PACKAGE}FILES+= zfs_unmount_008_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_unmount.kshlib .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_unshare FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unshare_test -FILES+= zfs_unshare_003_pos.ksh -FILES+= setup.ksh -FILES+= zfs_unshare_002_pos.ksh -FILES+= zfs_unshare.cfg -FILES+= cleanup.ksh -FILES+= zfs_unshare_005_neg.ksh -FILES+= zfs_unshare_001_pos.ksh -FILES+= zfs_unshare_004_neg.ksh +${PACKAGE}FILES+= zfs_unshare_003_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_unshare_002_pos.ksh +${PACKAGE}FILES+= zfs_unshare.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_unshare_005_neg.ksh +${PACKAGE}FILES+= zfs_unshare_001_pos.ksh +${PACKAGE}FILES+= zfs_unshare_004_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile (revision 300530) @@ -1,22 +1,23 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_upgrade FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_upgrade_test -FILES+= zfs_upgrade.cfg -FILES+= cleanup.ksh -FILES+= zfs_upgrade_004_pos.ksh -FILES+= zfs_upgrade_001_pos.ksh -FILES+= zfs_upgrade_005_pos.ksh -FILES+= setup.ksh -FILES+= zfs_upgrade.kshlib -FILES+= zfs_upgrade_006_neg.ksh -FILES+= zfs_upgrade_003_pos.ksh -FILES+= zfs_upgrade_007_neg.ksh -FILES+= zfs_upgrade_002_pos.ksh +${PACKAGE}FILES+= zfs_upgrade.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_upgrade_004_pos.ksh +${PACKAGE}FILES+= zfs_upgrade_001_pos.ksh +${PACKAGE}FILES+= zfs_upgrade_005_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs_upgrade.kshlib +${PACKAGE}FILES+= zfs_upgrade_006_neg.ksh +${PACKAGE}FILES+= zfs_upgrade_003_pos.ksh +${PACKAGE}FILES+= zfs_upgrade_007_neg.ksh +${PACKAGE}FILES+= zfs_upgrade_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_test -FILES+= zpool_001_neg.ksh -FILES+= cleanup.ksh -FILES+= zpool.cfg -FILES+= zpool_003_pos.ksh -FILES+= zpool_002_pos.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= zpool_001_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool.cfg +${PACKAGE}FILES+= zpool_003_pos.ksh +${PACKAGE}FILES+= zpool_002_pos.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile (revision 300530) @@ -1,24 +1,25 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_add FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_add_test -FILES+= zpool_add_002_pos.ksh -FILES+= zpool_add_006_pos.ksh -FILES+= zpool_add_007_neg.ksh -FILES+= cleanup.ksh -FILES+= zpool_add_003_pos.ksh -FILES+= zpool_add.cfg -FILES+= zpool_add_001_pos.ksh -FILES+= zpool_add_005_pos.ksh -FILES+= zpool_add_008_neg.ksh -FILES+= setup.ksh -FILES+= zpool_add_004_pos.ksh -FILES+= zpool_add.kshlib -FILES+= zpool_add_009_neg.ksh +${PACKAGE}FILES+= zpool_add_002_pos.ksh +${PACKAGE}FILES+= zpool_add_006_pos.ksh +${PACKAGE}FILES+= zpool_add_007_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_add_003_pos.ksh +${PACKAGE}FILES+= zpool_add.cfg +${PACKAGE}FILES+= zpool_add_001_pos.ksh +${PACKAGE}FILES+= zpool_add_005_pos.ksh +${PACKAGE}FILES+= zpool_add_008_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_add_004_pos.ksh +${PACKAGE}FILES+= zpool_add.kshlib +${PACKAGE}FILES+= zpool_add_009_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_attach FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_attach_test -FILES+= setup.ksh -FILES+= zpool_attach_001_neg.ksh -FILES+= cleanup.ksh -FILES+= zpool_attach.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_attach_001_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_attach.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_clear FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_clear_test -FILES+= cleanup.ksh -FILES+= zpool_clear_003_neg.ksh -FILES+= zpool_clear_002_neg.ksh -FILES+= zpool_clear.cfg -FILES+= zpool_clear_001_pos.ksh -FILES+= setup.ksh -FILES+= zpool_clear_004_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_clear_003_neg.ksh +${PACKAGE}FILES+= zpool_clear_002_neg.ksh +${PACKAGE}FILES+= zpool_clear.cfg +${PACKAGE}FILES+= zpool_clear_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_clear_004_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile (revision 300530) @@ -1,38 +1,39 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_create FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_create_test -FILES+= zpool_create_003_pos.ksh -FILES+= zpool_create_020_pos.ksh -FILES+= zpool_create_017_neg.ksh -FILES+= zpool_create_013_neg.ksh -FILES+= zpool_create_016_pos.ksh -FILES+= zpool_create_012_neg.ksh -FILES+= zpool_create_006_pos.ksh -FILES+= zpool_create_002_pos.ksh -FILES+= zpool_create_021_pos.ksh -FILES+= zpool_create_007_neg.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zpool_create_014_neg.ksh -FILES+= zpool_create_010_neg.ksh -FILES+= zpool_create_019_pos.ksh -FILES+= zpool_create_008_pos.ksh -FILES+= zpool_create_004_pos.ksh -FILES+= zpool_create_009_neg.ksh -FILES+= zpool_create_022_pos.ksh -FILES+= zpool_create.cfg -FILES+= zpool_create_005_pos.ksh -FILES+= zpool_create_001_pos.ksh -FILES+= zpool_create_023_neg.ksh -FILES+= zpool_create.kshlib -FILES+= zpool_create_015_neg.ksh -FILES+= zpool_create_011_neg.ksh -FILES+= zpool_create_018_pos.ksh +${PACKAGE}FILES+= zpool_create_003_pos.ksh +${PACKAGE}FILES+= zpool_create_020_pos.ksh +${PACKAGE}FILES+= zpool_create_017_neg.ksh +${PACKAGE}FILES+= zpool_create_013_neg.ksh +${PACKAGE}FILES+= zpool_create_016_pos.ksh +${PACKAGE}FILES+= zpool_create_012_neg.ksh +${PACKAGE}FILES+= zpool_create_006_pos.ksh +${PACKAGE}FILES+= zpool_create_002_pos.ksh +${PACKAGE}FILES+= zpool_create_021_pos.ksh +${PACKAGE}FILES+= zpool_create_007_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_create_014_neg.ksh +${PACKAGE}FILES+= zpool_create_010_neg.ksh +${PACKAGE}FILES+= zpool_create_019_pos.ksh +${PACKAGE}FILES+= zpool_create_008_pos.ksh +${PACKAGE}FILES+= zpool_create_004_pos.ksh +${PACKAGE}FILES+= zpool_create_009_neg.ksh +${PACKAGE}FILES+= zpool_create_022_pos.ksh +${PACKAGE}FILES+= zpool_create.cfg +${PACKAGE}FILES+= zpool_create_005_pos.ksh +${PACKAGE}FILES+= zpool_create_001_pos.ksh +${PACKAGE}FILES+= zpool_create_023_neg.ksh +${PACKAGE}FILES+= zpool_create.kshlib +${PACKAGE}FILES+= zpool_create_015_neg.ksh +${PACKAGE}FILES+= zpool_create_011_neg.ksh +${PACKAGE}FILES+= zpool_create_018_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_destroy FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_destroy_test -FILES+= cleanup.ksh +${PACKAGE}FILES+= cleanup.ksh -FILES+= zpool_destroy.cfg -FILES+= zpool_destroy_001_pos.ksh -FILES+= zpool_destroy_002_pos.ksh -FILES+= zpool_destroy_003_neg.ksh -FILES+= zpool_destroy_004_pos.ksh +${PACKAGE}FILES+= zpool_destroy.cfg +${PACKAGE}FILES+= zpool_destroy_001_pos.ksh +${PACKAGE}FILES+= zpool_destroy_002_pos.ksh +${PACKAGE}FILES+= zpool_destroy_003_neg.ksh +${PACKAGE}FILES+= zpool_destroy_004_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_detach FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_detach_test -FILES+= zpool_detach.cfg -FILES+= zpool_detach_001_neg.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= zpool_detach.cfg +${PACKAGE}FILES+= zpool_detach_001_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_expand FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_expand_test -FILES+= zpool_expand_003_neg.ksh -FILES+= setup.ksh -FILES+= zpool_expand_002_pos.ksh -FILES+= cleanup.ksh -FILES+= zpool_expand.cfg -FILES+= zpool_expand_001_pos.ksh +${PACKAGE}FILES+= zpool_expand_003_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_expand_002_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_expand.cfg +${PACKAGE}FILES+= zpool_expand_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_export FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_export_test -FILES+= zpool_export.cfg -FILES+= setup.ksh -FILES+= zpool_export_001_pos.ksh -FILES+= cleanup.ksh -FILES+= zpool_export_004_pos.ksh -FILES+= zpool_export_003_neg.ksh -FILES+= zpool_export_002_pos.ksh +${PACKAGE}FILES+= zpool_export.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_export_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_export_004_pos.ksh +${PACKAGE}FILES+= zpool_export_003_neg.ksh +${PACKAGE}FILES+= zpool_export_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_get FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_get_test -FILES+= setup.ksh -FILES+= zpool_get_002_pos.ksh -FILES+= zpool_get_003_pos.ksh -FILES+= zpool_get.cfg -FILES+= zpool_get_001_pos.ksh -FILES+= zpool_get_004_neg.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_get_002_pos.ksh +${PACKAGE}FILES+= zpool_get_003_pos.ksh +${PACKAGE}FILES+= zpool_get.cfg +${PACKAGE}FILES+= zpool_get_001_pos.ksh +${PACKAGE}FILES+= zpool_get_004_neg.ksh +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_history FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_history_test -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zpool_history_001_neg.ksh -FILES+= zpool_history_002_pos.ksh -FILES+= zpool_history.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_history_001_neg.ksh +${PACKAGE}FILES+= zpool_history_002_pos.ksh +${PACKAGE}FILES+= zpool_history.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile (revision 300530) @@ -1,36 +1,37 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_import FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_import_test -FILES+= zpool_import_006_pos.ksh -FILES+= zpool_import_002_pos.ksh -FILES+= zpool_import_missing_003_pos.ksh -FILES+= zpool_import_all_001_pos.ksh -FILES+= zpool_import.cfg -FILES+= zpool_import_corrupt_001_pos.ksh -FILES+= zpool_import_012_pos.ksh -FILES+= zpool_import_013_neg.ksh -FILES+= zpool_import_007_pos.ksh -FILES+= zpool_import_003_pos.ksh -FILES+= zpool_import_rename_001_pos.ksh -FILES+= zpool_import_missing_002_pos.ksh -FILES+= setup.ksh -FILES+= zpool_import_010_pos.ksh -FILES+= zpool_import_014_pos.ksh -FILES+= cleanup.ksh -FILES+= zpool_import_011_neg.ksh -FILES+= zpool_import_missing_004_pos.ksh -FILES+= zpool_import_missing_005_pos.ksh -FILES+= zpool_import_005_pos.ksh -FILES+= zpool_import_009_neg.ksh -FILES+= zpool_import_missing_001_pos.ksh -FILES+= zpool_import_008_pos.ksh -FILES+= zpool_import_004_pos.ksh -FILES+= zpool_import.kshlib +${PACKAGE}FILES+= zpool_import_006_pos.ksh +${PACKAGE}FILES+= zpool_import_002_pos.ksh +${PACKAGE}FILES+= zpool_import_missing_003_pos.ksh +${PACKAGE}FILES+= zpool_import_all_001_pos.ksh +${PACKAGE}FILES+= zpool_import.cfg +${PACKAGE}FILES+= zpool_import_corrupt_001_pos.ksh +${PACKAGE}FILES+= zpool_import_012_pos.ksh +${PACKAGE}FILES+= zpool_import_013_neg.ksh +${PACKAGE}FILES+= zpool_import_007_pos.ksh +${PACKAGE}FILES+= zpool_import_003_pos.ksh +${PACKAGE}FILES+= zpool_import_rename_001_pos.ksh +${PACKAGE}FILES+= zpool_import_missing_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_import_010_pos.ksh +${PACKAGE}FILES+= zpool_import_014_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_import_011_neg.ksh +${PACKAGE}FILES+= zpool_import_missing_004_pos.ksh +${PACKAGE}FILES+= zpool_import_missing_005_pos.ksh +${PACKAGE}FILES+= zpool_import_005_pos.ksh +${PACKAGE}FILES+= zpool_import_009_neg.ksh +${PACKAGE}FILES+= zpool_import_missing_001_pos.ksh +${PACKAGE}FILES+= zpool_import_008_pos.ksh +${PACKAGE}FILES+= zpool_import_004_pos.ksh +${PACKAGE}FILES+= zpool_import.kshlib .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_offline FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_offline_test -FILES+= cleanup.ksh -FILES+= zpool_offline_002_neg.ksh -FILES+= setup.ksh -FILES+= zpool_offline_001_pos.ksh -FILES+= zpool_offline.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_offline_002_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_offline_001_pos.ksh +${PACKAGE}FILES+= zpool_offline.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_online FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_online_test -FILES+= cleanup.ksh -FILES+= zpool_online.cfg -FILES+= zpool_online_002_neg.ksh -FILES+= zpool_online_001_pos.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_online.cfg +${PACKAGE}FILES+= zpool_online_002_neg.ksh +${PACKAGE}FILES+= zpool_online_001_pos.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_remove FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_remove_test -FILES+= zpool_remove_001_neg.ksh -FILES+= setup.ksh -FILES+= zpool_remove.cfg -FILES+= zpool_remove_002_pos.ksh -FILES+= cleanup.ksh -FILES+= zpool_remove_003_pos.ksh +${PACKAGE}FILES+= zpool_remove_001_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_remove.cfg +${PACKAGE}FILES+= zpool_remove_002_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_remove_003_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_replace FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_replace_test -FILES+= zpool_replace_001_neg.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zpool_replace.cfg +${PACKAGE}FILES+= zpool_replace_001_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_replace.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_scrub FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_scrub_test -FILES+= zpool_scrub_001_neg.ksh -FILES+= zpool_scrub_004_pos.ksh -FILES+= cleanup.ksh -FILES+= zpool_scrub_005_pos.ksh -FILES+= zpool_scrub.cfg -FILES+= zpool_scrub_003_pos.ksh -FILES+= setup.ksh -FILES+= zpool_scrub_002_pos.ksh +${PACKAGE}FILES+= zpool_scrub_001_neg.ksh +${PACKAGE}FILES+= zpool_scrub_004_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_scrub_005_pos.ksh +${PACKAGE}FILES+= zpool_scrub.cfg +${PACKAGE}FILES+= zpool_scrub_003_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_scrub_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile (revision 300530) @@ -1,14 +1,15 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_set FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_set_test -FILES+= zpool_set_002_neg.ksh -FILES+= zpool_set_003_neg.ksh -FILES+= zpool_set_001_pos.ksh +${PACKAGE}FILES+= zpool_set_002_neg.ksh +${PACKAGE}FILES+= zpool_set_003_neg.ksh +${PACKAGE}FILES+= zpool_set_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_status FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_status_test -FILES+= zpool_status.cfg -FILES+= zpool_status_001_pos.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zpool_status_002_pos.ksh +${PACKAGE}FILES+= zpool_status.cfg +${PACKAGE}FILES+= zpool_status_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_status_002_pos.ksh .include Index: 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/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile (revision 300530) @@ -1,26 +1,27 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_upgrade FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_upgrade_test -FILES+= setup.ksh -FILES+= zpool_upgrade_003_pos.ksh -FILES+= zpool_upgrade_007_pos.ksh -FILES+= zpool_upgrade_006_neg.ksh -FILES+= zpool_upgrade_002_pos.ksh -FILES+= zpool_upgrade.cfg -FILES+= zpool_upgrade_004_pos.ksh -FILES+= zpool_upgrade_008_pos.ksh -FILES+= zpool_upgrade_005_neg.ksh -FILES+= zpool_upgrade_009_neg.ksh -FILES+= zpool_upgrade.kshlib -FILES+= cleanup.ksh -FILES+= zpool_upgrade_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_upgrade_003_pos.ksh +${PACKAGE}FILES+= zpool_upgrade_007_pos.ksh +${PACKAGE}FILES+= zpool_upgrade_006_neg.ksh +${PACKAGE}FILES+= zpool_upgrade_002_pos.ksh +${PACKAGE}FILES+= zpool_upgrade.cfg +${PACKAGE}FILES+= zpool_upgrade_004_pos.ksh +${PACKAGE}FILES+= zpool_upgrade_008_pos.ksh +${PACKAGE}FILES+= zpool_upgrade_005_neg.ksh +${PACKAGE}FILES+= zpool_upgrade_009_neg.ksh +${PACKAGE}FILES+= zpool_upgrade.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_upgrade_001_pos.ksh SUBDIR+= blockfiles .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile (revision 300530) @@ -1,64 +1,65 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles FILESDIR=${TESTSDIR} -FILES+= README -FILES+= zfs-broken-mirror1.dat.Z -FILES+= zfs-broken-mirror2.dat.Z -FILES+= zfs-pool-v1.dat.Z -FILES+= zfs-pool-v10.dat.Z -FILES+= zfs-pool-v11.dat.Z -FILES+= zfs-pool-v12.dat.Z -FILES+= zfs-pool-v13.dat.Z -FILES+= zfs-pool-v14.dat.Z -FILES+= zfs-pool-v15.dat.Z -FILES+= zfs-pool-v1mirror1.dat.Z -FILES+= zfs-pool-v1mirror2.dat.Z -FILES+= zfs-pool-v1mirror3.dat.Z -FILES+= zfs-pool-v1raidz1.dat.Z -FILES+= zfs-pool-v1raidz2.dat.Z -FILES+= zfs-pool-v1raidz3.dat.Z -FILES+= zfs-pool-v1stripe1.dat.Z -FILES+= zfs-pool-v1stripe2.dat.Z -FILES+= zfs-pool-v1stripe3.dat.Z -FILES+= zfs-pool-v2.dat.Z -FILES+= zfs-pool-v28.dat.Z -FILES+= zfs-pool-v2mirror1.dat.Z -FILES+= zfs-pool-v2mirror2.dat.Z -FILES+= zfs-pool-v2mirror3.dat.Z -FILES+= zfs-pool-v2raidz1.dat.Z -FILES+= zfs-pool-v2raidz2.dat.Z -FILES+= zfs-pool-v2raidz3.dat.Z -FILES+= zfs-pool-v2stripe1.dat.Z -FILES+= zfs-pool-v2stripe2.dat.Z -FILES+= zfs-pool-v2stripe3.dat.Z -FILES+= zfs-pool-v3.dat.Z -FILES+= zfs-pool-v3hotspare1.dat.Z -FILES+= zfs-pool-v3hotspare2.dat.Z -FILES+= zfs-pool-v3hotspare3.dat.Z -FILES+= zfs-pool-v3mirror1.dat.Z -FILES+= zfs-pool-v3mirror2.dat.Z -FILES+= zfs-pool-v3mirror3.dat.Z -FILES+= zfs-pool-v3raidz1.dat.Z -FILES+= zfs-pool-v3raidz2.dat.Z -FILES+= zfs-pool-v3raidz21.dat.Z -FILES+= zfs-pool-v3raidz22.dat.Z -FILES+= zfs-pool-v3raidz23.dat.Z -FILES+= zfs-pool-v3raidz3.dat.Z -FILES+= zfs-pool-v3stripe1.dat.Z -FILES+= zfs-pool-v3stripe2.dat.Z -FILES+= zfs-pool-v3stripe3.dat.Z -FILES+= zfs-pool-v4.dat.Z -FILES+= zfs-pool-v5.dat.Z -FILES+= zfs-pool-v5000.dat.Z -FILES+= zfs-pool-v6.dat.Z -FILES+= zfs-pool-v7.dat.Z -FILES+= zfs-pool-v8.dat.Z -FILES+= zfs-pool-v9.dat.Z -FILES+= zfs-pool-v999.dat.Z -FILES+= zfs-pool-vBROKEN.dat.Z +${PACKAGE}FILES+= README +${PACKAGE}FILES+= zfs-broken-mirror1.dat.Z +${PACKAGE}FILES+= zfs-broken-mirror2.dat.Z +${PACKAGE}FILES+= zfs-pool-v1.dat.Z +${PACKAGE}FILES+= zfs-pool-v10.dat.Z +${PACKAGE}FILES+= zfs-pool-v11.dat.Z +${PACKAGE}FILES+= zfs-pool-v12.dat.Z +${PACKAGE}FILES+= zfs-pool-v13.dat.Z +${PACKAGE}FILES+= zfs-pool-v14.dat.Z +${PACKAGE}FILES+= zfs-pool-v15.dat.Z +${PACKAGE}FILES+= zfs-pool-v1mirror1.dat.Z +${PACKAGE}FILES+= zfs-pool-v1mirror2.dat.Z +${PACKAGE}FILES+= zfs-pool-v1mirror3.dat.Z +${PACKAGE}FILES+= zfs-pool-v1raidz1.dat.Z +${PACKAGE}FILES+= zfs-pool-v1raidz2.dat.Z +${PACKAGE}FILES+= zfs-pool-v1raidz3.dat.Z +${PACKAGE}FILES+= zfs-pool-v1stripe1.dat.Z +${PACKAGE}FILES+= zfs-pool-v1stripe2.dat.Z +${PACKAGE}FILES+= zfs-pool-v1stripe3.dat.Z +${PACKAGE}FILES+= zfs-pool-v2.dat.Z +${PACKAGE}FILES+= zfs-pool-v28.dat.Z +${PACKAGE}FILES+= zfs-pool-v2mirror1.dat.Z +${PACKAGE}FILES+= zfs-pool-v2mirror2.dat.Z +${PACKAGE}FILES+= zfs-pool-v2mirror3.dat.Z +${PACKAGE}FILES+= zfs-pool-v2raidz1.dat.Z +${PACKAGE}FILES+= zfs-pool-v2raidz2.dat.Z +${PACKAGE}FILES+= zfs-pool-v2raidz3.dat.Z +${PACKAGE}FILES+= zfs-pool-v2stripe1.dat.Z +${PACKAGE}FILES+= zfs-pool-v2stripe2.dat.Z +${PACKAGE}FILES+= zfs-pool-v2stripe3.dat.Z +${PACKAGE}FILES+= zfs-pool-v3.dat.Z +${PACKAGE}FILES+= zfs-pool-v3hotspare1.dat.Z +${PACKAGE}FILES+= zfs-pool-v3hotspare2.dat.Z +${PACKAGE}FILES+= zfs-pool-v3hotspare3.dat.Z +${PACKAGE}FILES+= zfs-pool-v3mirror1.dat.Z +${PACKAGE}FILES+= zfs-pool-v3mirror2.dat.Z +${PACKAGE}FILES+= zfs-pool-v3mirror3.dat.Z +${PACKAGE}FILES+= zfs-pool-v3raidz1.dat.Z +${PACKAGE}FILES+= zfs-pool-v3raidz2.dat.Z +${PACKAGE}FILES+= zfs-pool-v3raidz21.dat.Z +${PACKAGE}FILES+= zfs-pool-v3raidz22.dat.Z +${PACKAGE}FILES+= zfs-pool-v3raidz23.dat.Z +${PACKAGE}FILES+= zfs-pool-v3raidz3.dat.Z +${PACKAGE}FILES+= zfs-pool-v3stripe1.dat.Z +${PACKAGE}FILES+= zfs-pool-v3stripe2.dat.Z +${PACKAGE}FILES+= zfs-pool-v3stripe3.dat.Z +${PACKAGE}FILES+= zfs-pool-v4.dat.Z +${PACKAGE}FILES+= zfs-pool-v5.dat.Z +${PACKAGE}FILES+= zfs-pool-v5000.dat.Z +${PACKAGE}FILES+= zfs-pool-v6.dat.Z +${PACKAGE}FILES+= zfs-pool-v7.dat.Z +${PACKAGE}FILES+= zfs-pool-v8.dat.Z +${PACKAGE}FILES+= zfs-pool-v9.dat.Z +${PACKAGE}FILES+= zfs-pool-v999.dat.Z +${PACKAGE}FILES+= zfs-pool-vBROKEN.dat.Z .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user FILESDIR=${TESTSDIR} -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= cli.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= cli.cfg TESTS_SUBDIRS+= zpool_iostat TESTS_SUBDIRS+= zpool_list TESTS_SUBDIRS+= zfs_list TESTS_SUBDIRS+= misc .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile (revision 300530) @@ -1,57 +1,58 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/misc FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= misc_test -FILES+= zfs_rename_001_neg.ksh -FILES+= zpool_remove_001_neg.ksh -FILES+= zfs_destroy_001_neg.ksh -FILES+= zpool_import_001_neg.ksh -FILES+= zfs_unshare_001_neg.ksh -FILES+= zpool_export_001_neg.ksh -FILES+= zfs_set_001_neg.ksh -FILES+= zpool_upgrade_001_neg.ksh -FILES+= zpool_replace_001_neg.ksh -FILES+= misc.cfg -FILES+= zfs_receive_001_neg.ksh -FILES+= zpool_online_001_neg.ksh -FILES+= zpool_history_001_neg.ksh -FILES+= zpool_create_001_neg.ksh -FILES+= zpool_create_002_pos.ksh -FILES+= zfs_promote_001_neg.ksh -FILES+= zfs_get_001_neg.ksh -FILES+= zfs_share_001_neg.ksh -FILES+= zfs_rollback_001_neg.ksh -FILES+= zfs_unallow_001_neg.ksh -FILES+= zfs_send_001_neg.ksh -FILES+= zpool_clear_001_neg.ksh -FILES+= zpool_add_001_neg.ksh -FILES+= zpool_add_002_pos.ksh -FILES+= zpool_import_002_neg.ksh -FILES+= zpool_set_001_neg.ksh -FILES+= zfs_inherit_001_neg.ksh -FILES+= zfs_unmount_001_neg.ksh -FILES+= zpool_destroy_001_neg.ksh -FILES+= zpool_detach_001_neg.ksh -FILES+= zfs_create_001_neg.ksh -FILES+= zpool_attach_001_neg.ksh -FILES+= zpool_001_neg.ksh -FILES+= zdb_001_neg.ksh -FILES+= zfs_001_neg.ksh -FILES+= zfs_upgrade_001_neg.ksh -FILES+= zpool_scrub_001_neg.ksh -FILES+= zfs_mount_001_neg.ksh -FILES+= cleanup.ksh -FILES+= zpool_get_001_neg.ksh -FILES+= zfs_allow_001_neg.ksh -FILES+= zpool_offline_001_neg.ksh -FILES+= zfs_clone_001_neg.ksh -FILES+= zpool_status_001_neg.ksh -FILES+= zfs_snapshot_001_neg.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= zfs_rename_001_neg.ksh +${PACKAGE}FILES+= zpool_remove_001_neg.ksh +${PACKAGE}FILES+= zfs_destroy_001_neg.ksh +${PACKAGE}FILES+= zpool_import_001_neg.ksh +${PACKAGE}FILES+= zfs_unshare_001_neg.ksh +${PACKAGE}FILES+= zpool_export_001_neg.ksh +${PACKAGE}FILES+= zfs_set_001_neg.ksh +${PACKAGE}FILES+= zpool_upgrade_001_neg.ksh +${PACKAGE}FILES+= zpool_replace_001_neg.ksh +${PACKAGE}FILES+= misc.cfg +${PACKAGE}FILES+= zfs_receive_001_neg.ksh +${PACKAGE}FILES+= zpool_online_001_neg.ksh +${PACKAGE}FILES+= zpool_history_001_neg.ksh +${PACKAGE}FILES+= zpool_create_001_neg.ksh +${PACKAGE}FILES+= zpool_create_002_pos.ksh +${PACKAGE}FILES+= zfs_promote_001_neg.ksh +${PACKAGE}FILES+= zfs_get_001_neg.ksh +${PACKAGE}FILES+= zfs_share_001_neg.ksh +${PACKAGE}FILES+= zfs_rollback_001_neg.ksh +${PACKAGE}FILES+= zfs_unallow_001_neg.ksh +${PACKAGE}FILES+= zfs_send_001_neg.ksh +${PACKAGE}FILES+= zpool_clear_001_neg.ksh +${PACKAGE}FILES+= zpool_add_001_neg.ksh +${PACKAGE}FILES+= zpool_add_002_pos.ksh +${PACKAGE}FILES+= zpool_import_002_neg.ksh +${PACKAGE}FILES+= zpool_set_001_neg.ksh +${PACKAGE}FILES+= zfs_inherit_001_neg.ksh +${PACKAGE}FILES+= zfs_unmount_001_neg.ksh +${PACKAGE}FILES+= zpool_destroy_001_neg.ksh +${PACKAGE}FILES+= zpool_detach_001_neg.ksh +${PACKAGE}FILES+= zfs_create_001_neg.ksh +${PACKAGE}FILES+= zpool_attach_001_neg.ksh +${PACKAGE}FILES+= zpool_001_neg.ksh +${PACKAGE}FILES+= zdb_001_neg.ksh +${PACKAGE}FILES+= zfs_001_neg.ksh +${PACKAGE}FILES+= zfs_upgrade_001_neg.ksh +${PACKAGE}FILES+= zpool_scrub_001_neg.ksh +${PACKAGE}FILES+= zfs_mount_001_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_get_001_neg.ksh +${PACKAGE}FILES+= zfs_allow_001_neg.ksh +${PACKAGE}FILES+= zpool_offline_001_neg.ksh +${PACKAGE}FILES+= zfs_clone_001_neg.ksh +${PACKAGE}FILES+= zpool_status_001_neg.ksh +${PACKAGE}FILES+= zfs_snapshot_001_neg.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile (revision 300530) @@ -1,23 +1,24 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zfs_list FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_list_test -FILES+= zfs_list_006_pos.ksh -FILES+= zfs_list_002_pos.ksh -FILES+= zfs_list_007_pos.ksh -FILES+= zfs_list_003_pos.ksh -FILES+= zfs_list.cfg -FILES+= zfs_list_005_pos.ksh -FILES+= zfs_list_001_pos.ksh -FILES+= zfs_list.kshlib -FILES+= zfs_list_008_neg.ksh -FILES+= zfs_list_004_neg.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= zfs_list_006_pos.ksh +${PACKAGE}FILES+= zfs_list_002_pos.ksh +${PACKAGE}FILES+= zfs_list_007_pos.ksh +${PACKAGE}FILES+= zfs_list_003_pos.ksh +${PACKAGE}FILES+= zfs_list.cfg +${PACKAGE}FILES+= zfs_list_005_pos.ksh +${PACKAGE}FILES+= zfs_list_001_pos.ksh +${PACKAGE}FILES+= zfs_list.kshlib +${PACKAGE}FILES+= zfs_list_008_neg.ksh +${PACKAGE}FILES+= zfs_list_004_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zpool_iostat FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_iostat_test -FILES+= cleanup.ksh -FILES+= zpool_iostat.cfg -FILES+= zpool_iostat_003_neg.ksh -FILES+= zpool_iostat_002_pos.ksh -FILES+= setup.ksh -FILES+= zpool_iostat_001_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_iostat.cfg +${PACKAGE}FILES+= zpool_iostat_003_neg.ksh +${PACKAGE}FILES+= zpool_iostat_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zpool_iostat_001_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zpool_list FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_list_test -FILES+= zpool_list_001_pos.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zpool_list.cfg -FILES+= zpool_list_002_neg.ksh +${PACKAGE}FILES+= zpool_list_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zpool_list.cfg +${PACKAGE}FILES+= zpool_list_002_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/compression FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= compression_test -FILES+= compress_004_pos.ksh -FILES+= compress_001_pos.ksh -FILES+= compress_003_pos.ksh -FILES+= setup.ksh -FILES+= compress.cfg -FILES+= cleanup.ksh +${PACKAGE}FILES+= compress_004_pos.ksh +${PACKAGE}FILES+= compress_001_pos.ksh +${PACKAGE}FILES+= compress_003_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= compress.cfg +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/ctime FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= ctime.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= ctime.cfg PROG= ctime_001_pos MAN= ATF_TESTS_KSH93= ctime_test .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/delegate FILESDIR=${TESTSDIR} -FILES+= delegate.cfg -FILES+= delegate_common.kshlib -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= delegate.cfg +${PACKAGE}FILES+= delegate_common.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh TESTS_SUBDIRS+= zfs_allow TESTS_SUBDIRS+= zfs_unallow .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/Makefile (revision 300530) @@ -1,24 +1,25 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/delegate/zfs_allow FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_allow_test -FILES+= zfs_allow_003_pos.ksh -FILES+= zfs_allow_007_pos.ksh -FILES+= zfs_allow_002_pos.ksh -FILES+= zfs_allow_006_pos.ksh -FILES+= zfs_allow_012_neg.ksh -FILES+= zfs_allow_009_neg.ksh -FILES+= zfs_allow_004_pos.ksh -FILES+= zfs_allow_008_pos.ksh -FILES+= zfs_allow_010_pos.ksh -FILES+= cleanup.ksh -FILES+= zfs_allow_011_neg.ksh -FILES+= zfs_allow_001_pos.ksh -FILES+= zfs_allow_005_pos.ksh +${PACKAGE}FILES+= zfs_allow_003_pos.ksh +${PACKAGE}FILES+= zfs_allow_007_pos.ksh +${PACKAGE}FILES+= zfs_allow_002_pos.ksh +${PACKAGE}FILES+= zfs_allow_006_pos.ksh +${PACKAGE}FILES+= zfs_allow_012_neg.ksh +${PACKAGE}FILES+= zfs_allow_009_neg.ksh +${PACKAGE}FILES+= zfs_allow_004_pos.ksh +${PACKAGE}FILES+= zfs_allow_008_pos.ksh +${PACKAGE}FILES+= zfs_allow_010_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zfs_allow_011_neg.ksh +${PACKAGE}FILES+= zfs_allow_001_pos.ksh +${PACKAGE}FILES+= zfs_allow_005_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/delegate/zfs_unallow FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfs_unallow_test -FILES+= zfs_unallow_003_pos.ksh -FILES+= zfs_unallow_007_neg.ksh -FILES+= zfs_unallow_006_pos.ksh -FILES+= zfs_unallow_002_pos.ksh -FILES+= zfs_unallow_004_pos.ksh -FILES+= zfs_unallow_008_neg.ksh -FILES+= zfs_unallow_005_pos.ksh -FILES+= zfs_unallow_001_pos.ksh +${PACKAGE}FILES+= zfs_unallow_003_pos.ksh +${PACKAGE}FILES+= zfs_unallow_007_neg.ksh +${PACKAGE}FILES+= zfs_unallow_006_pos.ksh +${PACKAGE}FILES+= zfs_unallow_002_pos.ksh +${PACKAGE}FILES+= zfs_unallow_004_pos.ksh +${PACKAGE}FILES+= zfs_unallow_008_neg.ksh +${PACKAGE}FILES+= zfs_unallow_005_pos.ksh +${PACKAGE}FILES+= zfs_unallow_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/devices FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= devices_test -FILES+= devices_common.kshlib -FILES+= devices_002_neg.ksh -FILES+= devices_test.sh -FILES+= devices_003_pos.ksh -FILES+= devices.cfg -FILES+= devices_001_pos.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= devices_common.kshlib +${PACKAGE}FILES+= devices_002_neg.ksh +${PACKAGE}FILES+= devices_test.sh +${PACKAGE}FILES+= devices_003_pos.ksh +${PACKAGE}FILES+= devices.cfg +${PACKAGE}FILES+= devices_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/Makefile (revision 300530) @@ -1,18 +1,19 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/exec/ FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= exec_test -FILES+= exec_001_pos.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= exec_002_neg.ksh +${PACKAGE}FILES+= exec_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= exec_002_neg.ksh PROG= mmap_exec MAN= .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/grow_pool FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= grow_pool_test -FILES+= grow_pool_001_pos.ksh -FILES+= grow_pool.cfg -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= grow_pool_001_pos.ksh +${PACKAGE}FILES+= grow_pool.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/grow_replicas FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= grow_replicas_test -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= grow_replicas.cfg -FILES+= grow_replicas_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= grow_replicas.cfg +${PACKAGE}FILES+= grow_replicas_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/history/Makefile (revision 300530) @@ -1,30 +1,31 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/history/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= history_test -FILES+= history_005_neg.ksh -FILES+= history_004_pos.ksh -FILES+= history_008_pos.ksh -FILES+= i386.orig_history.txt -FILES+= sparc.orig_history.txt -FILES+= history_common.kshlib -FILES+= history.cfg -FILES+= sparc.migratedpool.DAT.Z -FILES+= history_010_pos.ksh -FILES+= setup.ksh -FILES+= zfs-pool-v4.dat.Z -FILES+= history_009_pos.ksh -FILES+= history_001_pos.ksh -FILES+= history_006_neg.ksh -FILES+= i386.migratedpool.DAT.Z -FILES+= history_003_pos.ksh -FILES+= history_007_pos.ksh -FILES+= history_002_pos.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= history_005_neg.ksh +${PACKAGE}FILES+= history_004_pos.ksh +${PACKAGE}FILES+= history_008_pos.ksh +${PACKAGE}FILES+= i386.orig_history.txt +${PACKAGE}FILES+= sparc.orig_history.txt +${PACKAGE}FILES+= history_common.kshlib +${PACKAGE}FILES+= history.cfg +${PACKAGE}FILES+= sparc.migratedpool.DAT.Z +${PACKAGE}FILES+= history_010_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfs-pool-v4.dat.Z +${PACKAGE}FILES+= history_009_pos.ksh +${PACKAGE}FILES+= history_001_pos.ksh +${PACKAGE}FILES+= history_006_neg.ksh +${PACKAGE}FILES+= i386.migratedpool.DAT.Z +${PACKAGE}FILES+= history_003_pos.ksh +${PACKAGE}FILES+= history_007_pos.ksh +${PACKAGE}FILES+= history_002_pos.ksh +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile (revision 300530) @@ -1,26 +1,27 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/hotplug FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotplug_test -FILES+= hotplug.cfg -FILES+= hotplug_006_pos.ksh -FILES+= hotplug_002_pos.ksh -FILES+= cleanup.ksh -FILES+= hotplug_007_pos.ksh -FILES+= hotplug_003_pos.ksh -FILES+= setup.ksh -FILES+= hotplug_005_pos.ksh -FILES+= hotplug_001_pos.ksh -FILES+= hotplug_009_pos.ksh -FILES+= hotplug_010_pos.ksh -FILES+= hotplug.kshlib -FILES+= hotplug_011_pos.ksh -FILES+= hotplug_008_pos.ksh -FILES+= hotplug_004_pos.ksh +${PACKAGE}FILES+= hotplug.cfg +${PACKAGE}FILES+= hotplug_006_pos.ksh +${PACKAGE}FILES+= hotplug_002_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= hotplug_007_pos.ksh +${PACKAGE}FILES+= hotplug_003_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= hotplug_005_pos.ksh +${PACKAGE}FILES+= hotplug_001_pos.ksh +${PACKAGE}FILES+= hotplug_009_pos.ksh +${PACKAGE}FILES+= hotplug_010_pos.ksh +${PACKAGE}FILES+= hotplug.kshlib +${PACKAGE}FILES+= hotplug_011_pos.ksh +${PACKAGE}FILES+= hotplug_008_pos.ksh +${PACKAGE}FILES+= hotplug_004_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/Makefile (revision 300530) @@ -1,43 +1,44 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/hotspare FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotspare_test -FILES+= hotspare_create_001_neg.ksh -FILES+= setup.ksh -FILES+= hotspare_add_004_neg.ksh -FILES+= hotspare_scrub_002_pos.ksh -FILES+= hotspare_detach_002_pos.ksh -FILES+= hotspare_remove_001_pos.ksh -FILES+= hotspare_add_001_pos.ksh -FILES+= hotspare_import_001_pos.ksh -FILES+= hotspare_replace_002_neg.ksh -FILES+= hotspare_clone_002_pos.ksh -FILES+= hotspare_replace_003_neg.ksh -FILES+= hotspare_export_001_neg.ksh -FILES+= hotspare_snapshot_001_pos.ksh -FILES+= hotspare_remove_004_pos.ksh -FILES+= hotspare_detach_003_pos.ksh -FILES+= hotspare_onoffline_004_neg.ksh -FILES+= cleanup.ksh -FILES+= hotspare_replace_001_neg.ksh -FILES+= hotspare_scrub_001_pos.ksh -FILES+= hotspare_detach_001_pos.ksh -FILES+= hotspare_add_003_neg.ksh -FILES+= hotspare_remove_003_neg.ksh -FILES+= hotspare_add_002_pos.ksh -FILES+= hotspare_detach_004_pos.ksh -FILES+= hotspare_snapshot_002_pos.ksh -FILES+= hotspare.kshlib -FILES+= hotspare_detach_005_neg.ksh -FILES+= hotspare_remove_002_neg.ksh -FILES+= hotspare_onoffline_003_neg.ksh -FILES+= hotspare_shared_001_pos.ksh -FILES+= hotspare.cfg -FILES+= hotspare_clone_001_pos.ksh +${PACKAGE}FILES+= hotspare_create_001_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= hotspare_add_004_neg.ksh +${PACKAGE}FILES+= hotspare_scrub_002_pos.ksh +${PACKAGE}FILES+= hotspare_detach_002_pos.ksh +${PACKAGE}FILES+= hotspare_remove_001_pos.ksh +${PACKAGE}FILES+= hotspare_add_001_pos.ksh +${PACKAGE}FILES+= hotspare_import_001_pos.ksh +${PACKAGE}FILES+= hotspare_replace_002_neg.ksh +${PACKAGE}FILES+= hotspare_clone_002_pos.ksh +${PACKAGE}FILES+= hotspare_replace_003_neg.ksh +${PACKAGE}FILES+= hotspare_export_001_neg.ksh +${PACKAGE}FILES+= hotspare_snapshot_001_pos.ksh +${PACKAGE}FILES+= hotspare_remove_004_pos.ksh +${PACKAGE}FILES+= hotspare_detach_003_pos.ksh +${PACKAGE}FILES+= hotspare_onoffline_004_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= hotspare_replace_001_neg.ksh +${PACKAGE}FILES+= hotspare_scrub_001_pos.ksh +${PACKAGE}FILES+= hotspare_detach_001_pos.ksh +${PACKAGE}FILES+= hotspare_add_003_neg.ksh +${PACKAGE}FILES+= hotspare_remove_003_neg.ksh +${PACKAGE}FILES+= hotspare_add_002_pos.ksh +${PACKAGE}FILES+= hotspare_detach_004_pos.ksh +${PACKAGE}FILES+= hotspare_snapshot_002_pos.ksh +${PACKAGE}FILES+= hotspare.kshlib +${PACKAGE}FILES+= hotspare_detach_005_neg.ksh +${PACKAGE}FILES+= hotspare_remove_002_neg.ksh +${PACKAGE}FILES+= hotspare_onoffline_003_neg.ksh +${PACKAGE}FILES+= hotspare_shared_001_pos.ksh +${PACKAGE}FILES+= hotspare.cfg +${PACKAGE}FILES+= hotspare_clone_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/Makefile (revision 300530) @@ -1,63 +1,64 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/inheritance FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inheritance_test -FILES+= config015.cfg -FILES+= config012.cfg -FILES+= state007.cfg -FILES+= state009.cfg -FILES+= config020.cfg -FILES+= state024.cfg -FILES+= state023.cfg -FILES+= state018.cfg -FILES+= state016.cfg -FILES+= cleanup.ksh -FILES+= config003.cfg -FILES+= state011.cfg -FILES+= config004.cfg -FILES+= config021.cfg -FILES+= state008.cfg -FILES+= config013.cfg -FILES+= state006.cfg -FILES+= config014.cfg -FILES+= state001.cfg -FILES+= state010.cfg -FILES+= config005.cfg -FILES+= state017.cfg -FILES+= config002.cfg -FILES+= state019.cfg -FILES+= state022.cfg -FILES+= state014.cfg -FILES+= config001.cfg -FILES+= state013.cfg -FILES+= config006.cfg -FILES+= config008.cfg -FILES+= inherit_001_pos.ksh -FILES+= state021.cfg -FILES+= config022.cfg -FILES+= config019.cfg -FILES+= config017.cfg -FILES+= state002.cfg -FILES+= config010.cfg -FILES+= state005.cfg -FILES+= state020.cfg -FILES+= inherit.kshlib -FILES+= config009.cfg -FILES+= state012.cfg -FILES+= config007.cfg -FILES+= state015.cfg -FILES+= config011.cfg -FILES+= inherit.cfg -FILES+= state004.cfg -FILES+= config016.cfg -FILES+= state003.cfg -FILES+= config018.cfg -FILES+= config023.cfg -FILES+= config024.cfg +${PACKAGE}FILES+= config015.cfg +${PACKAGE}FILES+= config012.cfg +${PACKAGE}FILES+= state007.cfg +${PACKAGE}FILES+= state009.cfg +${PACKAGE}FILES+= config020.cfg +${PACKAGE}FILES+= state024.cfg +${PACKAGE}FILES+= state023.cfg +${PACKAGE}FILES+= state018.cfg +${PACKAGE}FILES+= state016.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= config003.cfg +${PACKAGE}FILES+= state011.cfg +${PACKAGE}FILES+= config004.cfg +${PACKAGE}FILES+= config021.cfg +${PACKAGE}FILES+= state008.cfg +${PACKAGE}FILES+= config013.cfg +${PACKAGE}FILES+= state006.cfg +${PACKAGE}FILES+= config014.cfg +${PACKAGE}FILES+= state001.cfg +${PACKAGE}FILES+= state010.cfg +${PACKAGE}FILES+= config005.cfg +${PACKAGE}FILES+= state017.cfg +${PACKAGE}FILES+= config002.cfg +${PACKAGE}FILES+= state019.cfg +${PACKAGE}FILES+= state022.cfg +${PACKAGE}FILES+= state014.cfg +${PACKAGE}FILES+= config001.cfg +${PACKAGE}FILES+= state013.cfg +${PACKAGE}FILES+= config006.cfg +${PACKAGE}FILES+= config008.cfg +${PACKAGE}FILES+= inherit_001_pos.ksh +${PACKAGE}FILES+= state021.cfg +${PACKAGE}FILES+= config022.cfg +${PACKAGE}FILES+= config019.cfg +${PACKAGE}FILES+= config017.cfg +${PACKAGE}FILES+= state002.cfg +${PACKAGE}FILES+= config010.cfg +${PACKAGE}FILES+= state005.cfg +${PACKAGE}FILES+= state020.cfg +${PACKAGE}FILES+= inherit.kshlib +${PACKAGE}FILES+= config009.cfg +${PACKAGE}FILES+= state012.cfg +${PACKAGE}FILES+= config007.cfg +${PACKAGE}FILES+= state015.cfg +${PACKAGE}FILES+= config011.cfg +${PACKAGE}FILES+= inherit.cfg +${PACKAGE}FILES+= state004.cfg +${PACKAGE}FILES+= config016.cfg +${PACKAGE}FILES+= state003.cfg +${PACKAGE}FILES+= config018.cfg +${PACKAGE}FILES+= config023.cfg +${PACKAGE}FILES+= config024.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/interop FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= interop_test -FILES+= cleanup.ksh -FILES+= interop_001_pos.ksh -FILES+= setup.ksh -FILES+= interop.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= interop_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= interop.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/Makefile (revision 300530) @@ -1,22 +1,23 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/inuse FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= inuse_test -FILES+= inuse_002_pos.ksh -FILES+= inuse_006_pos.ksh -FILES+= inuse_003_pos.ksh -FILES+= inuse_007_pos.ksh -FILES+= inuse_009_pos.ksh -FILES+= inuse_001_pos.ksh -FILES+= inuse_005_pos.ksh -FILES+= inuse.cfg -FILES+= setup.ksh -FILES+= inuse_004_pos.ksh -FILES+= inuse_008_pos.ksh +${PACKAGE}FILES+= inuse_002_pos.ksh +${PACKAGE}FILES+= inuse_006_pos.ksh +${PACKAGE}FILES+= inuse_003_pos.ksh +${PACKAGE}FILES+= inuse_007_pos.ksh +${PACKAGE}FILES+= inuse_009_pos.ksh +${PACKAGE}FILES+= inuse_001_pos.ksh +${PACKAGE}FILES+= inuse_005_pos.ksh +${PACKAGE}FILES+= inuse.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= inuse_004_pos.ksh +${PACKAGE}FILES+= inuse_008_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/Makefile (revision 300530) @@ -1,21 +1,22 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/iscsi FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= iscsi_test -FILES+= iscsi_004_pos.ksh -FILES+= cleanup.ksh -FILES+= iscsi_005_pos.ksh -FILES+= iscsi_001_pos.ksh -FILES+= iscsi_common.kshlib -FILES+= iscsi_002_neg.ksh -FILES+= iscsi_006_neg.ksh -FILES+= iscsi_003_neg.ksh -FILES+= setup.ksh -FILES+= iscsi.cfg +${PACKAGE}FILES+= iscsi_004_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= iscsi_005_pos.ksh +${PACKAGE}FILES+= iscsi_001_pos.ksh +${PACKAGE}FILES+= iscsi_common.kshlib +${PACKAGE}FILES+= iscsi_002_neg.ksh +${PACKAGE}FILES+= iscsi_006_neg.ksh +${PACKAGE}FILES+= iscsi_003_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= iscsi.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/large_files FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= large_files_test -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= large_files_001_pos.ksh -FILES+= large_files.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= large_files_001_pos.ksh +${PACKAGE}FILES+= large_files.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/Makefile (revision 300530) @@ -1,13 +1,14 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/largest_pool FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= largest_pool_test -FILES+= largest_pool.cfg -FILES+= largest_pool_001_pos.ksh +${PACKAGE}FILES+= largest_pool.cfg +${PACKAGE}FILES+= largest_pool_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/link_count/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= link_count_test -FILES+= link_count_001.ksh -FILES+= cleanup.ksh -FILES+= link_count.cfg -FILES+= setup.ksh +${PACKAGE}FILES+= link_count_001.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= link_count.cfg +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mdb FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mdb_test -FILES+= mdb.cfg -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= mdb_001_pos.ksh +${PACKAGE}FILES+= mdb.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= mdb_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/Makefile (revision 300530) @@ -1,27 +1,28 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/migration/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= migration_test -FILES+= migration_011_pos.ksh -FILES+= migration_008_pos.ksh -FILES+= migration_004_pos.ksh -FILES+= migration.cfg -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= migration_005_pos.ksh -FILES+= migration_001_pos.ksh -FILES+= migration_009_pos.ksh -FILES+= migration_010_pos.ksh -FILES+= migration_007_pos.ksh -FILES+= migration_003_pos.ksh -FILES+= migration_012_pos.ksh -FILES+= migration.kshlib -FILES+= migration_006_pos.ksh -FILES+= migration_002_pos.ksh +${PACKAGE}FILES+= migration_011_pos.ksh +${PACKAGE}FILES+= migration_008_pos.ksh +${PACKAGE}FILES+= migration_004_pos.ksh +${PACKAGE}FILES+= migration.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= migration_005_pos.ksh +${PACKAGE}FILES+= migration_001_pos.ksh +${PACKAGE}FILES+= migration_009_pos.ksh +${PACKAGE}FILES+= migration_010_pos.ksh +${PACKAGE}FILES+= migration_007_pos.ksh +${PACKAGE}FILES+= migration_003_pos.ksh +${PACKAGE}FILES+= migration_012_pos.ksh +${PACKAGE}FILES+= migration.kshlib +${PACKAGE}FILES+= migration_006_pos.ksh +${PACKAGE}FILES+= migration_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile (revision 300530) @@ -1,12 +1,10 @@ # $FreeBSD$ -.include +.include TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap -FILESDIR=${TESTSDIR} - TESTS_SUBDIRS+= mmap_read TESTS_SUBDIRS+= mmap_write .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap/mmap_read FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mmap_read_test -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= mmap_read_001_pos.ksh -FILES+= mmap_read.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= mmap_read_001_pos.ksh +${PACKAGE}FILES+= mmap_read.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap/mmap_write FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mmap_write_test -FILES+= mmap_write_001_pos.ksh -FILES+= mmap_write.cfg -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= mmap_write_001_pos.ksh +${PACKAGE}FILES+= mmap_write.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mount/ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mount_test -FILES+= vars.cfg -FILES+= mounttest.ksh -FILES+= mount_test.sh -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= vars.cfg +${PACKAGE}FILES+= mounttest.ksh +${PACKAGE}FILES+= mount_test.sh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mv_files FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= mv_files_test -FILES+= cleanup.ksh -FILES+= mv_files_common.kshlib -FILES+= mv_files_002_pos.ksh -FILES+= setup.ksh -FILES+= mv_files_001_pos.ksh -FILES+= mv_files.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= mv_files_common.kshlib +${PACKAGE}FILES+= mv_files_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= mv_files_001_pos.ksh +${PACKAGE}FILES+= mv_files.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/nestedfs FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= nestedfs_test -FILES+= nestedfs.cfg -FILES+= setup.ksh -FILES+= nestedfs_001_pos.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= nestedfs.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= nestedfs_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/no_space FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= no_space_test -FILES+= enospc.cfg -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= enospc_001_pos.ksh +${PACKAGE}FILES+= enospc.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= enospc_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/online_offline FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= online_offline_test -FILES+= online_offline_001_pos.ksh -FILES+= online_offline.cfg -FILES+= cleanup.ksh -FILES+= online_offline_002_neg.ksh +${PACKAGE}FILES+= online_offline_001_pos.ksh +${PACKAGE}FILES+= online_offline.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= online_offline_002_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/Makefile (revision 300530) @@ -1,14 +1,15 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/pool_names FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= pool_names_test -FILES+= pool_names_002_neg.ksh -FILES+= pool_names.cfg -FILES+= pool_names_001_pos.ksh +${PACKAGE}FILES+= pool_names_002_neg.ksh +${PACKAGE}FILES+= pool_names.cfg +${PACKAGE}FILES+= pool_names_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/poolversion FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= poolversion_test -FILES+= poolversion_002_pos.ksh -FILES+= poolversion_001_pos.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh +${PACKAGE}FILES+= poolversion_002_pos.ksh +${PACKAGE}FILES+= poolversion_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/privilege FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= privilege_test -FILES+= privilege_001_pos.ksh -FILES+= setup.ksh -FILES+= privilege.cfg -FILES+= cleanup.ksh -FILES+= privilege_002_pos.ksh +${PACKAGE}FILES+= privilege_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= privilege.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= privilege_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/Makefile (revision 300530) @@ -1,21 +1,22 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/quota FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= quota_test -FILES+= quota_003_pos.ksh -FILES+= quota_006_neg.ksh -FILES+= quota_002_pos.ksh -FILES+= setup.ksh -FILES+= quota.kshlib -FILES+= cleanup.ksh -FILES+= quota_004_pos.ksh -FILES+= quota_005_pos.ksh -FILES+= quota_001_pos.ksh -FILES+= quota.cfg +${PACKAGE}FILES+= quota_003_pos.ksh +${PACKAGE}FILES+= quota_006_neg.ksh +${PACKAGE}FILES+= quota_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= quota.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= quota_004_pos.ksh +${PACKAGE}FILES+= quota_005_pos.ksh +${PACKAGE}FILES+= quota_001_pos.ksh +${PACKAGE}FILES+= quota.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/redundancy FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= redundancy_test -FILES+= redundancy.cfg -FILES+= redundancy_003_pos.ksh -FILES+= redundancy_002_pos.ksh -FILES+= setup.ksh -FILES+= redundancy.kshlib -FILES+= cleanup.ksh -FILES+= redundancy_001_pos.ksh -FILES+= redundancy_004_neg.ksh +${PACKAGE}FILES+= redundancy.cfg +${PACKAGE}FILES+= redundancy_003_pos.ksh +${PACKAGE}FILES+= redundancy_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= redundancy.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= redundancy_001_pos.ksh +${PACKAGE}FILES+= redundancy_004_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/Makefile (revision 300530) @@ -1,20 +1,21 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/refquota FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= refquota_test -FILES+= refquota_001_pos.ksh -FILES+= refquota_005_pos.ksh -FILES+= refquota.cfg -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= refquota_004_pos.ksh -FILES+= refquota_002_pos.ksh -FILES+= refquota_003_pos.ksh -FILES+= refquota_006_neg.ksh +${PACKAGE}FILES+= refquota_001_pos.ksh +${PACKAGE}FILES+= refquota_005_pos.ksh +${PACKAGE}FILES+= refquota.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= refquota_004_pos.ksh +${PACKAGE}FILES+= refquota_002_pos.ksh +${PACKAGE}FILES+= refquota_003_pos.ksh +${PACKAGE}FILES+= refquota_006_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/refreserv FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= refreserv_test -FILES+= refreserv_004_pos.ksh -FILES+= refreserv_005_pos.ksh -FILES+= refreserv_001_pos.ksh -FILES+= refreserv_003_pos.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= refreserv.cfg -FILES+= refreserv_002_pos.ksh +${PACKAGE}FILES+= refreserv_004_pos.ksh +${PACKAGE}FILES+= refreserv_005_pos.ksh +${PACKAGE}FILES+= refreserv_001_pos.ksh +${PACKAGE}FILES+= refreserv_003_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= refreserv.cfg +${PACKAGE}FILES+= refreserv_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote FILESDIR=${TESTSDIR} -FILES+= remote_common.kshlib -FILES+= setup.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= remote_common.kshlib +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh TESTS_SUBDIRS+= cross_endian TESTS_SUBDIRS+= rebooting TESTS_SUBDIRS+= sharing .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/Makefile (revision 300530) @@ -1,20 +1,21 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote/cross_endian FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= cross_endian_test -FILES+= setup.ksh -FILES+= cross_endian.cfg -FILES+= cross_endian_002_pos.ksh -FILES+= r_verify_recv.ksh -FILES+= cleanup.ksh -FILES+= cross_endian_001_pos.ksh -FILES+= r_verify_import.ksh -FILES+= r_cleanup.ksh -FILES+= cross_endian_common.kshlib +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cross_endian.cfg +${PACKAGE}FILES+= cross_endian_002_pos.ksh +${PACKAGE}FILES+= r_verify_recv.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= cross_endian_001_pos.ksh +${PACKAGE}FILES+= r_verify_import.ksh +${PACKAGE}FILES+= r_cleanup.ksh +${PACKAGE}FILES+= cross_endian_common.kshlib .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote/rebooting FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rebooting_test -FILES+= rebooting.cfg -FILES+= r_setup.ksh -FILES+= r_dir_ops.ksh -FILES+= r_cleanup.ksh -FILES+= rebooting_001_pos.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= r_verify_booting.ksh +${PACKAGE}FILES+= rebooting.cfg +${PACKAGE}FILES+= r_setup.ksh +${PACKAGE}FILES+= r_dir_ops.ksh +${PACKAGE}FILES+= r_cleanup.ksh +${PACKAGE}FILES+= rebooting_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= r_verify_booting.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/remote/sharing FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= sharing_test -FILES+= r_setup.ksh -FILES+= r_cleanup.ksh -FILES+= cleanup.ksh -FILES+= sharing_001_pos.ksh -FILES+= setup.ksh -FILES+= sharing.cfg +${PACKAGE}FILES+= r_setup.ksh +${PACKAGE}FILES+= r_cleanup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= sharing_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= sharing.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rename_dirs FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rename_dirs_test -FILES+= cleanup.ksh -FILES+= rename_dirs_001_pos.ksh -FILES+= setup.ksh -FILES+= rename_dirs.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= rename_dirs_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= rename_dirs.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/replacement FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= replacement_test -FILES+= replacement_002_pos.ksh -FILES+= replacement_003_pos.ksh -FILES+= replacement_001_pos.ksh -FILES+= cleanup.ksh -FILES+= replacement.kshlib +${PACKAGE}FILES+= replacement_002_pos.ksh +${PACKAGE}FILES+= replacement_003_pos.ksh +${PACKAGE}FILES+= replacement_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= replacement.kshlib .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/Makefile (revision 300530) @@ -1,33 +1,34 @@ # $FreeBSD$ -.include +.include -TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/reservation -FILESDIR=${TESTSDIR} +PACKAGE= tests +TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests/reservation +FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= reservation_test -FILES+= reservation.cfg -FILES+= reservation_007_pos.ksh -FILES+= reservation_003_pos.ksh -FILES+= reservation_012_pos.ksh -FILES+= reservation_016_pos.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= reservation_013_pos.ksh -FILES+= reservation_017_pos.ksh -FILES+= reservation_006_pos.ksh -FILES+= reservation_002_pos.ksh -FILES+= reservation_011_pos.ksh -FILES+= reservation_015_pos.ksh -FILES+= reservation_004_pos.ksh -FILES+= reservation_008_pos.ksh -FILES+= reservation_009_pos.ksh -FILES+= reservation_005_pos.ksh -FILES+= reservation_001_pos.ksh -FILES+= reservation.kshlib -FILES+= reservation_010_pos.ksh -FILES+= reservation_014_pos.ksh -FILES+= reservation_018_pos.ksh +${PACKAGE}FILES+= reservation.cfg +${PACKAGE}FILES+= reservation_007_pos.ksh +${PACKAGE}FILES+= reservation_003_pos.ksh +${PACKAGE}FILES+= reservation_012_pos.ksh +${PACKAGE}FILES+= reservation_016_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= reservation_013_pos.ksh +${PACKAGE}FILES+= reservation_017_pos.ksh +${PACKAGE}FILES+= reservation_006_pos.ksh +${PACKAGE}FILES+= reservation_002_pos.ksh +${PACKAGE}FILES+= reservation_011_pos.ksh +${PACKAGE}FILES+= reservation_015_pos.ksh +${PACKAGE}FILES+= reservation_004_pos.ksh +${PACKAGE}FILES+= reservation_008_pos.ksh +${PACKAGE}FILES+= reservation_009_pos.ksh +${PACKAGE}FILES+= reservation_005_pos.ksh +${PACKAGE}FILES+= reservation_001_pos.ksh +${PACKAGE}FILES+= reservation.kshlib +${PACKAGE}FILES+= reservation_010_pos.ksh +${PACKAGE}FILES+= reservation_014_pos.ksh +${PACKAGE}FILES+= reservation_018_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile (revision 300530) @@ -1,20 +1,21 @@ # $FreeBSD$ -.include +.include -TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rootpool -FILESDIR=${TESTSDIR} +PACKAGE= tests +TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests/rootpool +FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= rootpool_test -FILES+= rootpool_006_pos.ksh -FILES+= cleanup.ksh -FILES+= rootpool_003_neg.ksh -FILES+= rootpool_007_neg.ksh -FILES+= rootpool_002_neg.ksh -FILES+= setup.ksh -FILES+= rootpool_005_pos.ksh -FILES+= rootpool_001_pos.ksh -FILES+= rootpool_004_pos.ksh +${PACKAGE}FILES+= rootpool_006_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= rootpool_003_neg.ksh +${PACKAGE}FILES+= rootpool_007_neg.ksh +${PACKAGE}FILES+= rootpool_002_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= rootpool_005_pos.ksh +${PACKAGE}FILES+= rootpool_001_pos.ksh +${PACKAGE}FILES+= rootpool_004_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/Makefile (revision 300530) @@ -1,28 +1,29 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rsend FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= rsend_test -FILES+= rsend_003_pos.ksh -FILES+= rsend_007_pos.ksh -FILES+= rsend_012_pos.ksh -FILES+= rsend_013_pos.ksh -FILES+= rsend_002_pos.ksh -FILES+= rsend_006_pos.ksh -FILES+= setup.ksh -FILES+= rsend_011_pos.ksh -FILES+= rsend.kshlib -FILES+= rsend_008_pos.ksh -FILES+= rsend_004_pos.ksh -FILES+= rsend_001_pos.ksh -FILES+= rsend_005_pos.ksh -FILES+= cleanup.ksh -FILES+= rsend_009_pos.ksh -FILES+= rsend.cfg -FILES+= rsend_010_pos.ksh +${PACKAGE}FILES+= rsend_003_pos.ksh +${PACKAGE}FILES+= rsend_007_pos.ksh +${PACKAGE}FILES+= rsend_012_pos.ksh +${PACKAGE}FILES+= rsend_013_pos.ksh +${PACKAGE}FILES+= rsend_002_pos.ksh +${PACKAGE}FILES+= rsend_006_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= rsend_011_pos.ksh +${PACKAGE}FILES+= rsend.kshlib +${PACKAGE}FILES+= rsend_008_pos.ksh +${PACKAGE}FILES+= rsend_004_pos.ksh +${PACKAGE}FILES+= rsend_001_pos.ksh +${PACKAGE}FILES+= rsend_005_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= rsend_009_pos.ksh +${PACKAGE}FILES+= rsend.cfg +${PACKAGE}FILES+= rsend_010_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/sas_phy_thrash FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= sas_phy_thrash_test -FILES+= sas_phy_thrash_001_pos.ksh -FILES+= sas_phy_thrash.cfg -FILES+= setup.ksh -FILES+= cleanup.ksh +${PACKAGE}FILES+= sas_phy_thrash_001_pos.ksh +${PACKAGE}FILES+= sas_phy_thrash.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/scrub_mirror FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= scrub_mirror_test -FILES+= scrub_mirror_004_pos.ksh -FILES+= setup.ksh -FILES+= scrub_mirror_001_pos.ksh -FILES+= scrub_mirror_003_pos.ksh -FILES+= cleanup.ksh -FILES+= default.cfg -FILES+= scrub_mirror_002_pos.ksh -FILES+= scrub_mirror_common.kshlib +${PACKAGE}FILES+= scrub_mirror_004_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= scrub_mirror_001_pos.ksh +${PACKAGE}FILES+= scrub_mirror_003_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= default.cfg +${PACKAGE}FILES+= scrub_mirror_002_pos.ksh +${PACKAGE}FILES+= scrub_mirror_common.kshlib .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/Makefile (revision 300530) @@ -1,29 +1,30 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/slog FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= slog_test -FILES+= slog_012_neg.ksh -FILES+= slog_013_pos.ksh -FILES+= slog_002_pos.ksh -FILES+= slog_006_pos.ksh -FILES+= slog.kshlib -FILES+= slog_003_pos.ksh -FILES+= slog_007_pos.ksh -FILES+= cleanup.ksh -FILES+= slog.cfg -FILES+= slog_001_pos.ksh -FILES+= slog_005_pos.ksh -FILES+= slog_008_neg.ksh -FILES+= slog_011_neg.ksh -FILES+= setup.ksh -FILES+= slog_014_pos.ksh -FILES+= slog_010_neg.ksh -FILES+= slog_004_pos.ksh -FILES+= slog_009_neg.ksh +${PACKAGE}FILES+= slog_012_neg.ksh +${PACKAGE}FILES+= slog_013_pos.ksh +${PACKAGE}FILES+= slog_002_pos.ksh +${PACKAGE}FILES+= slog_006_pos.ksh +${PACKAGE}FILES+= slog.kshlib +${PACKAGE}FILES+= slog_003_pos.ksh +${PACKAGE}FILES+= slog_007_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= slog.cfg +${PACKAGE}FILES+= slog_001_pos.ksh +${PACKAGE}FILES+= slog_005_pos.ksh +${PACKAGE}FILES+= slog_008_neg.ksh +${PACKAGE}FILES+= slog_011_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= slog_014_pos.ksh +${PACKAGE}FILES+= slog_010_neg.ksh +${PACKAGE}FILES+= slog_004_pos.ksh +${PACKAGE}FILES+= slog_009_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/Makefile (revision 300530) @@ -1,39 +1,40 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/snapshot FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= snapshot_test -FILES+= rollback_001_pos.ksh -FILES+= setup.ksh -FILES+= snapshot_017_pos.ksh -FILES+= snapshot_013_pos.ksh -FILES+= ctldir_acl.txt -FILES+= snapshot_002_pos.ksh -FILES+= snapshot_006_pos.ksh -FILES+= clone_001_pos.ksh -FILES+= snapshot_003_pos.ksh -FILES+= snapshot_007_pos.ksh -FILES+= snapshot_016_pos.ksh -FILES+= snapshot_012_pos.ksh -FILES+= snapshot_009_pos.ksh -FILES+= snapshot_001_pos.ksh -FILES+= snapshot_005_pos.ksh -FILES+= snapshot.cfg -FILES+= cleanup.ksh -FILES+= rollback_002_pos.ksh -FILES+= snapshot_014_pos.ksh -FILES+= snapshot_010_pos.ksh -FILES+= snapshot_018_pos.ksh -FILES+= rollback_003_pos.ksh -FILES+= snapshot_019_pos.ksh -FILES+= snapshot_015_pos.ksh -FILES+= snapshot_011_pos.ksh -FILES+= snapshot_004_pos.ksh -FILES+= snapshot_008_pos.ksh -FILES+= snapshot_020_pos.ksh +${PACKAGE}FILES+= rollback_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= snapshot_017_pos.ksh +${PACKAGE}FILES+= snapshot_013_pos.ksh +${PACKAGE}FILES+= ctldir_acl.txt +${PACKAGE}FILES+= snapshot_002_pos.ksh +${PACKAGE}FILES+= snapshot_006_pos.ksh +${PACKAGE}FILES+= clone_001_pos.ksh +${PACKAGE}FILES+= snapshot_003_pos.ksh +${PACKAGE}FILES+= snapshot_007_pos.ksh +${PACKAGE}FILES+= snapshot_016_pos.ksh +${PACKAGE}FILES+= snapshot_012_pos.ksh +${PACKAGE}FILES+= snapshot_009_pos.ksh +${PACKAGE}FILES+= snapshot_001_pos.ksh +${PACKAGE}FILES+= snapshot_005_pos.ksh +${PACKAGE}FILES+= snapshot.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= rollback_002_pos.ksh +${PACKAGE}FILES+= snapshot_014_pos.ksh +${PACKAGE}FILES+= snapshot_010_pos.ksh +${PACKAGE}FILES+= snapshot_018_pos.ksh +${PACKAGE}FILES+= rollback_003_pos.ksh +${PACKAGE}FILES+= snapshot_019_pos.ksh +${PACKAGE}FILES+= snapshot_015_pos.ksh +${PACKAGE}FILES+= snapshot_011_pos.ksh +${PACKAGE}FILES+= snapshot_004_pos.ksh +${PACKAGE}FILES+= snapshot_008_pos.ksh +${PACKAGE}FILES+= snapshot_020_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/Makefile (revision 300530) @@ -1,20 +1,21 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/snapused FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= snapused_test -FILES+= cleanup.ksh -FILES+= snapused_005_pos.ksh -FILES+= snapused_001_pos.ksh -FILES+= setup.ksh -FILES+= snapused_004_pos.ksh -FILES+= snapused.kshlib -FILES+= snapused.cfg -FILES+= snapused_002_pos.ksh -FILES+= snapused_003_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= snapused_005_pos.ksh +${PACKAGE}FILES+= snapused_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= snapused_004_pos.ksh +${PACKAGE}FILES+= snapused.kshlib +${PACKAGE}FILES+= snapused.cfg +${PACKAGE}FILES+= snapused_002_pos.ksh +${PACKAGE}FILES+= snapused_003_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/sparse FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= sparse_test -FILES+= sparse_001_pos.ksh -FILES+= setup.ksh -FILES+= sparse.cfg -FILES+= cleanup.ksh +${PACKAGE}FILES+= sparse_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= sparse.cfg +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/threadsappend FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= threadsappend_test -FILES+= cleanup.ksh -FILES+= threadsappend_001_pos.ksh -FILES+= threadsappend.cfg -FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= threadsappend_001_pos.ksh +${PACKAGE}FILES+= threadsappend.cfg +${PACKAGE}FILES+= setup.ksh PROG+= threadsappend LIBADD+= pthread MAN= .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/truncate FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= truncate_test -FILES+= truncate_001_pos.ksh -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= truncate_002_pos.ksh -FILES+= truncate.cfg +${PACKAGE}FILES+= truncate_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= truncate_002_pos.ksh +${PACKAGE}FILES+= truncate.cfg .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile (revision 300530) @@ -1,23 +1,24 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/txg_integrity FILESDIR=${TESTSDIR} BINDIR=${TESTSDIR} ATF_TESTS_KSH93+= txg_integrity_test -FILES+= setup.ksh -FILES+= txg_integrity_001_pos.ksh -FILES+= fsync_integrity_001_pos.ksh -FILES+= cleanup.ksh -FILES+= txg_integrity.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= txg_integrity_001_pos.ksh +${PACKAGE}FILES+= fsync_integrity_001_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= txg_integrity.cfg PROGS+= txg_integrity PROGS+= fsync_integrity LIBADD+= pthread SRCS.fsync_integrity= fsync_integrity.c SRCS.txg_integrity= txg_integrity.c .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/Makefile (revision 300530) @@ -1,31 +1,32 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/userquota FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= userquota_test -FILES+= groupspace_001_pos.ksh -FILES+= userquota_common.kshlib -FILES+= userquota_010_pos.ksh -FILES+= userquota_001_pos.ksh -FILES+= userquota_009_pos.ksh -FILES+= userquota_008_pos.ksh -FILES+= userquota_004_pos.ksh -FILES+= userquota_005_neg.ksh -FILES+= userspace_001_pos.ksh -FILES+= setup.ksh -FILES+= userquota_011_pos.ksh -FILES+= cleanup.ksh -FILES+= userquota_002_pos.ksh -FILES+= userquota_006_pos.ksh -FILES+= userquota_012_neg.ksh -FILES+= groupspace_002_pos.ksh -FILES+= userquota_003_pos.ksh -FILES+= userquota_007_pos.ksh -FILES+= userquota.cfg -FILES+= userspace_002_pos.ksh +${PACKAGE}FILES+= groupspace_001_pos.ksh +${PACKAGE}FILES+= userquota_common.kshlib +${PACKAGE}FILES+= userquota_010_pos.ksh +${PACKAGE}FILES+= userquota_001_pos.ksh +${PACKAGE}FILES+= userquota_009_pos.ksh +${PACKAGE}FILES+= userquota_008_pos.ksh +${PACKAGE}FILES+= userquota_004_pos.ksh +${PACKAGE}FILES+= userquota_005_neg.ksh +${PACKAGE}FILES+= userspace_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= userquota_011_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= userquota_002_pos.ksh +${PACKAGE}FILES+= userquota_006_pos.ksh +${PACKAGE}FILES+= userquota_012_neg.ksh +${PACKAGE}FILES+= groupspace_002_pos.ksh +${PACKAGE}FILES+= userquota_003_pos.ksh +${PACKAGE}FILES+= userquota_007_pos.ksh +${PACKAGE}FILES+= userquota.cfg +${PACKAGE}FILES+= userspace_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/Makefile (revision 300530) @@ -1,24 +1,25 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/utils_test FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= utils_test_test -FILES+= utils_test_007_pos.ksh -FILES+= utils_test_003_pos.ksh -FILES+= utils_test_006_pos.ksh -FILES+= utils_test_002_pos.ksh -FILES+= utils_test.kshlib -FILES+= cleanup.ksh -FILES+= utils_test_004_pos.ksh -FILES+= utils_test_008_pos.ksh -FILES+= utils_test.cfg -FILES+= setup.ksh -FILES+= utils_test_009_pos.ksh -FILES+= utils_test_005_pos.ksh -FILES+= utils_test_001_pos.ksh +${PACKAGE}FILES+= utils_test_007_pos.ksh +${PACKAGE}FILES+= utils_test_003_pos.ksh +${PACKAGE}FILES+= utils_test_006_pos.ksh +${PACKAGE}FILES+= utils_test_002_pos.ksh +${PACKAGE}FILES+= utils_test.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= utils_test_004_pos.ksh +${PACKAGE}FILES+= utils_test_008_pos.ksh +${PACKAGE}FILES+= utils_test.cfg +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= utils_test_009_pos.ksh +${PACKAGE}FILES+= utils_test_005_pos.ksh +${PACKAGE}FILES+= utils_test_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/write_dirs FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= write_dirs_test -FILES+= write_dirs.cfg -FILES+= write_dirs_002_pos.ksh -FILES+= cleanup.ksh -FILES+= setup.ksh -FILES+= write_dirs_001_pos.ksh +${PACKAGE}FILES+= write_dirs.cfg +${PACKAGE}FILES+= write_dirs_002_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= write_dirs_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/Makefile (revision 300530) @@ -1,28 +1,29 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/xattr FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= xattr_test -FILES+= xattr_002_neg.ksh -FILES+= xattr_012_pos.ksh -FILES+= xattr_013_pos.ksh -FILES+= setup.ksh -FILES+= xattr_003_neg.ksh -FILES+= xattr_007_neg.ksh -FILES+= xattr_common.kshlib -FILES+= xattr.cfg -FILES+= xattr_006_pos.ksh -FILES+= xattr_011_pos.ksh -FILES+= xattr_010_neg.ksh -FILES+= xattr_009_neg.ksh -FILES+= xattr_008_pos.ksh -FILES+= xattr_004_pos.ksh -FILES+= cleanup.ksh -FILES+= xattr_005_pos.ksh -FILES+= xattr_001_pos.ksh +${PACKAGE}FILES+= xattr_002_neg.ksh +${PACKAGE}FILES+= xattr_012_pos.ksh +${PACKAGE}FILES+= xattr_013_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= xattr_003_neg.ksh +${PACKAGE}FILES+= xattr_007_neg.ksh +${PACKAGE}FILES+= xattr_common.kshlib +${PACKAGE}FILES+= xattr.cfg +${PACKAGE}FILES+= xattr_006_pos.ksh +${PACKAGE}FILES+= xattr_011_pos.ksh +${PACKAGE}FILES+= xattr_010_neg.ksh +${PACKAGE}FILES+= xattr_009_neg.ksh +${PACKAGE}FILES+= xattr_008_pos.ksh +${PACKAGE}FILES+= xattr_004_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= xattr_005_pos.ksh +${PACKAGE}FILES+= xattr_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile (revision 300530) @@ -1,34 +1,35 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zfsd FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfsd_test -FILES+= cleanup.ksh -FILES+= hotspare_cleanup.ksh -FILES+= hotspare_setup.ksh -FILES+= setup.ksh -FILES+= zfsd.cfg -FILES+= zfsd.kshlib -FILES+= zfsd_autoreplace_001_neg.ksh -FILES+= zfsd_autoreplace_002_pos.ksh -FILES+= zfsd_autoreplace_003_pos.ksh -FILES+= zfsd_degrade_001_pos.ksh -FILES+= zfsd_degrade_002_pos.ksh -FILES+= zfsd_fault_001_pos.ksh -FILES+= zfsd_hotspare_001_pos.ksh -FILES+= zfsd_hotspare_002_pos.ksh -FILES+= zfsd_hotspare_003_pos.ksh -FILES+= zfsd_hotspare_004_pos.ksh -FILES+= zfsd_hotspare_005_pos.ksh -FILES+= zfsd_hotspare_006_pos.ksh -FILES+= zfsd_hotspare_007_pos.ksh -FILES+= zfsd_import_001_pos.ksh -FILES+= zfsd_replace_001_pos.ksh -FILES+= zfsd_replace_002_pos.ksh -FILES+= zfsd_replace_003_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= hotspare_cleanup.ksh +${PACKAGE}FILES+= hotspare_setup.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zfsd.cfg +${PACKAGE}FILES+= zfsd.kshlib +${PACKAGE}FILES+= zfsd_autoreplace_001_neg.ksh +${PACKAGE}FILES+= zfsd_autoreplace_002_pos.ksh +${PACKAGE}FILES+= zfsd_autoreplace_003_pos.ksh +${PACKAGE}FILES+= zfsd_degrade_001_pos.ksh +${PACKAGE}FILES+= zfsd_degrade_002_pos.ksh +${PACKAGE}FILES+= zfsd_fault_001_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_001_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_002_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_003_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_004_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_005_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_006_pos.ksh +${PACKAGE}FILES+= zfsd_hotspare_007_pos.ksh +${PACKAGE}FILES+= zfsd_import_001_pos.ksh +${PACKAGE}FILES+= zfsd_replace_001_pos.ksh +${PACKAGE}FILES+= zfsd_replace_002_pos.ksh +${PACKAGE}FILES+= zfsd_replace_003_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zil FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zil_test -FILES+= zil_002_pos.ksh -FILES+= setup.ksh -FILES+= zil.cfg -FILES+= cleanup.ksh -FILES+= zil_001_pos.ksh -FILES+= zil.kshlib +${PACKAGE}FILES+= zil_002_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zil.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zil_001_pos.ksh +${PACKAGE}FILES+= zil.kshlib .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/Makefile (revision 300530) @@ -1,19 +1,20 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zinject FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zinject_test -FILES+= zinject.cfg -FILES+= cleanup.ksh -FILES+= zinject_004_pos.ksh -FILES+= setup.ksh -FILES+= zinject_001_pos.ksh -FILES+= zinject.kshlib -FILES+= zinject_003_pos.ksh -FILES+= zinject_002_pos.ksh +${PACKAGE}FILES+= zinject.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zinject_004_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zinject_001_pos.ksh +${PACKAGE}FILES+= zinject.kshlib +${PACKAGE}FILES+= zinject_003_pos.ksh +${PACKAGE}FILES+= zinject_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/Makefile (revision 300530) @@ -1,20 +1,21 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zones FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zones_test -FILES+= setup.ksh -FILES+= zones.cfg -FILES+= zones_005_pos.ksh -FILES+= zones_001_pos.ksh -FILES+= zones_004_pos.ksh -FILES+= zones_common.kshlib -FILES+= cleanup.ksh -FILES+= zones_002_pos.ksh -FILES+= zones_003_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zones.cfg +${PACKAGE}FILES+= zones_005_pos.ksh +${PACKAGE}FILES+= zones_001_pos.ksh +${PACKAGE}FILES+= zones_004_pos.ksh +${PACKAGE}FILES+= zones_common.kshlib +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zones_002_pos.ksh +${PACKAGE}FILES+= zones_003_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/Makefile (revision 300530) @@ -1,16 +1,17 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol FILESDIR=${TESTSDIR} -FILES+= zvol.cfg -FILES+= zvol_common.kshlib +${PACKAGE}FILES+= zvol.cfg +${PACKAGE}FILES+= zvol_common.kshlib TESTS_SUBDIRS+= zvol_ENOSPC TESTS_SUBDIRS+= zvol_swap TESTS_SUBDIRS+= zvol_misc TESTS_SUBDIRS+= zvol_cli .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_ENOSPC FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zvol_ENOSPC_test -FILES+= zvol_ENOSPC_001_pos.ksh -FILES+= setup.ksh -FILES+= zvol_ENOSPC.cfg -FILES+= cleanup.ksh +${PACKAGE}FILES+= zvol_ENOSPC_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zvol_ENOSPC.cfg +${PACKAGE}FILES+= cleanup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile (revision 300530) @@ -1,17 +1,18 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_cli FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zvol_cli_test -FILES+= setup.ksh -FILES+= zvol_cli_003_neg.ksh -FILES+= zvol_cli_002_pos.ksh -FILES+= zvol_cli.cfg -FILES+= cleanup.ksh -FILES+= zvol_cli_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zvol_cli_003_neg.ksh +${PACKAGE}FILES+= zvol_cli_002_pos.ksh +${PACKAGE}FILES+= zvol_cli.cfg +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zvol_cli_001_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile (revision 300530) @@ -1,23 +1,24 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_misc FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zvol_misc_test -FILES+= setup.ksh -FILES+= zvol_misc.cfg -FILES+= zvol_misc_006_pos.ksh -FILES+= zvol_misc_002_pos.ksh -FILES+= zvol_misc_003_neg.ksh -FILES+= zvol_misc_007_pos.ksh -FILES+= zvol_misc_009_pos.ksh -FILES+= zvol_misc_004_pos.ksh -FILES+= zvol_misc_008_pos.ksh -FILES+= zvol_misc_001_neg.ksh -FILES+= cleanup.ksh -FILES+= zvol_misc_005_neg.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zvol_misc.cfg +${PACKAGE}FILES+= zvol_misc_006_pos.ksh +${PACKAGE}FILES+= zvol_misc_002_pos.ksh +${PACKAGE}FILES+= zvol_misc_003_neg.ksh +${PACKAGE}FILES+= zvol_misc_007_pos.ksh +${PACKAGE}FILES+= zvol_misc_009_pos.ksh +${PACKAGE}FILES+= zvol_misc_004_pos.ksh +${PACKAGE}FILES+= zvol_misc_008_pos.ksh +${PACKAGE}FILES+= zvol_misc_001_neg.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zvol_misc_005_neg.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile (revision 300530) @@ -1,20 +1,21 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_swap FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zvol_swap_test -FILES+= zvol_swap_004_pos.ksh -FILES+= setup.ksh -FILES+= zvol_swap_005_pos.ksh -FILES+= zvol_swap_001_pos.ksh -FILES+= zvol_swap.cfg -FILES+= zvol_swap_003_pos.ksh -FILES+= cleanup.ksh -FILES+= zvol_swap_006_pos.ksh -FILES+= zvol_swap_002_pos.ksh +${PACKAGE}FILES+= zvol_swap_004_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= zvol_swap_005_pos.ksh +${PACKAGE}FILES+= zvol_swap_001_pos.ksh +${PACKAGE}FILES+= zvol_swap.cfg +${PACKAGE}FILES+= zvol_swap_003_pos.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zvol_swap_006_pos.ksh +${PACKAGE}FILES+= zvol_swap_002_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile (revision 300529) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile (revision 300530) @@ -1,15 +1,16 @@ # $FreeBSD$ -.include +.include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol_thrash FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zvol_thrash_test -FILES+= setup.ksh -FILES+= cleanup.ksh -FILES+= zvol_thrash.cfg -FILES+= zvol_thrash_001_pos.ksh +${PACKAGE}FILES+= setup.ksh +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= zvol_thrash.cfg +${PACKAGE}FILES+= zvol_thrash_001_pos.ksh .include