Index: projects/zfsd/head/etc/mtree/BSD.tests.dist =================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 292665) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 292666) @@ -1,620 +1,900 @@ # $FreeBSD$ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 . bin cat .. chown .. date .. dd .. expr .. ls .. mv .. pax .. pkill .. sh builtins .. errors .. execution .. expansion .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin + zfsd + .. .. usr.bin .. usr.sbin dtrace common aggs .. arithmetic .. arrays .. assocs .. begin .. bitfields .. buffering .. builtinvar .. cg .. clauses .. cpc .. decls .. drops .. dtraceUtil .. end .. enum .. error .. exit .. fbtprovider .. funcs .. grammar .. include .. inline .. io .. ip .. java_api .. json .. lexer .. llquantize .. mdb .. mib .. misc .. multiaggs .. offsetof .. operators .. pid .. plockstat .. pointers .. pragma .. predicates .. preprocessor .. print .. printa .. printf .. privs .. probes .. proc .. profile-n .. providers .. raise .. rates .. safety .. scalars .. sched .. scripting .. sdt .. sizeof .. speculation .. stability .. stack .. stackdepth .. stop .. strlen .. strtoll .. struct .. syscall .. sysevent .. tick-n .. trace .. tracemem .. translators .. typedef .. types .. uctf .. union .. usdt .. ustack .. vars .. version .. .. .. .. .. etc rc.d .. .. games .. gnu lib .. usr.bin diff .. .. .. lib atf libatf-c detail .. .. libatf-c++ detail .. .. test-programs .. .. libarchive .. libc c063 .. db .. gen execve .. posix_spawn .. .. hash data .. .. inet .. locale .. net getaddrinfo data .. .. .. regex data .. .. rpc .. ssp .. stdio .. stdlib .. string .. sys .. time .. tls dso .. .. termios .. ttyio .. .. libcrypt .. libmp .. libnv .. libpam .. libproc .. librt .. libthr dlopen .. .. libutil .. libxo .. msun .. .. libexec atf atf-check .. atf-sh .. .. rtld-elf .. .. sbin dhclient .. devd .. growfs .. ifconfig .. mdconfig .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. plain .. .. .. .. sys acl .. aio .. + cddl + zfs + bin + .. + include + .. + tests + acl + cifs + .. + nontrivial + .. + trivial + .. + .. + atime + .. + bootfs + .. + cache + .. + cachefile + .. + clean_mirror + assertion_001 + .. + assertion_002 + .. + assertion_003 + .. + assertion_004 + .. + .. + cli_root + zfs_upgrade + .. + zfs_promote + .. + zfs_clone + .. + zfs_property + .. + zfs_destroy + .. + zpool_create + .. + zpool_history + .. + zpool_expand + .. + zpool_remove + .. + zfs_mount + .. + zfs_unshare + .. + zdb + .. + zpool_online + .. + zpool_get + .. + zpool_export + .. + zfs_copies + .. + zfs_get + .. + zfs + .. + zpool_clear + .. + zpool_import + .. + zpool + .. + zpool_offline + .. + zpool_replace + .. + zfs_rollback + .. + zpool_set + .. + zfs_send + .. + zfs_set + .. + zpool_detach + .. + zpool_scrub + .. + zfs_inherit + .. + zfs_snapshot + .. + zfs_share + .. + zpool_destroy + .. + zpool_status + .. + zfs_unmount + .. + zfs_receive + .. + zfs_create + .. + zpool_upgrade + blockfiles + .. + .. + zpool_add + .. + zfs_rename + .. + zpool_attach + .. + zfs_reservation + .. + .. + cli_user + misc + .. + zfs_list + .. + zpool_iostat + .. + zpool_list + .. + .. + compression + .. + ctime + .. + delegate + zfs_allow + .. + zfs_unallow + .. + .. + devices + .. + exec + .. + grow_pool + .. + grow_replicas + .. + history + .. + hotplug + .. + hotspare + .. + inheritance + .. + interop + .. + inuse + .. + iscsi + .. + large_files + .. + largest_pool + .. + link_count + .. + mdb + .. + migration + .. + mmap + mmap_read + .. + mmap_write + .. + .. + mount + .. + mv_files + .. + nestedfs + .. + no_space + .. + online_offline + .. + pool_names + .. + poolversion + .. + privilege + .. + quota + .. + redundancy + .. + refquota + .. + refreserv + .. + remote + cross_endian + .. + rebooting + .. + sharing + .. + .. + rename_dirs + .. + replacement + .. + reservation + .. + rootpool + .. + rsend + .. + sas_phy_thrash + .. + scrub_mirror + .. + slog + .. + snapshot + .. + snapused + .. + sparse + .. + threadsappend + .. + truncate + .. + txg_integrity + .. + userquota + .. + utils_test + .. + write_dirs + .. + xattr + .. + zfsd + .. + zil + .. + zinject + .. + zones + .. + zvol + zvol_ENOSPC + .. + zvol_cli + .. + zvol_misc + .. + zvol_swap + .. + .. + zvol_thrash + .. + .. + .. + .. + dtrace + .. fifo .. file .. + geom + geom_part + .. + .. kern acct .. execve .. pipe .. .. kqueue .. mqueue + .. + net .. netinet .. opencrypto .. pjdfstest chflags .. chmod .. chown .. ftruncate .. granular .. link .. mkdir .. mkfifo .. mknod .. open .. rename .. rmdir .. symlink .. truncate .. unlink .. .. posixshm .. vfs .. vm .. .. usr.bin apply .. basename .. bmake archives fmt_44bsd .. fmt_44bsd_mod .. fmt_oldbsd .. .. basic t0 .. t1 .. t2 .. t3 .. .. execution ellipsis .. empty .. joberr .. plus .. .. shell builtin .. meta .. path .. path_select .. replace .. select .. .. suffixes basic .. src_wild1 .. src_wild2 .. .. syntax directive-t0 .. enl .. funny-targets .. semi .. .. sysmk t0 2 1 .. .. mk .. .. t1 2 1 .. .. mk .. .. t2 2 1 .. .. mk .. .. .. variables modifier_M .. modifier_t .. opt_V .. t0 .. .. .. calendar .. cmp .. cpio .. col .. comm .. cut .. dirname .. file2c .. grep .. gzip .. ident .. join .. jot .. lastcomm .. limits .. m4 .. mkimg .. ncal .. opensm .. printf .. sed regress.multitest.out .. .. soelim .. tar .. timeout .. tr .. truncate .. units .. uudecode .. uuencode .. xargs .. xo .. yacc yacc .. .. .. usr.sbin etcupdate .. fstyp .. makefs .. newsyslog .. nmtree .. pw .. sa .. .. .. # vim: set expandtab ts=4 sw=4: Index: projects/zfsd/head/share/mk/atf.test.mk =================================================================== --- projects/zfsd/head/share/mk/atf.test.mk (revision 292665) +++ projects/zfsd/head/share/mk/atf.test.mk (revision 292666) @@ -1,82 +1,108 @@ # $FreeBSD$ # # You must include bsd.test.mk instead of this file from your Makefile. # # Logic to build and install ATF test programs; i.e. test programs linked # against the ATF libraries. .if !target(____) .error atf.test.mk cannot be included directly. .endif # List of C, C++ and shell test programs to build. # # Programs listed here are built using PROGS, PROGS_CXX and SCRIPTS, # respectively, from bsd.prog.mk. However, the build rules are tweaked to # require the ATF libraries. # # Test programs registered in this manner are set to be installed into TESTSDIR # (which should be overriden by the Makefile) and are not required to provide a # manpage. ATF_TESTS_C?= ATF_TESTS_CXX?= ATF_TESTS_SH?= +ATF_TESTS_KSH93?= .if !empty(ATF_TESTS_C) PROGS+= ${ATF_TESTS_C} _TESTS+= ${ATF_TESTS_C} .for _T in ${ATF_TESTS_C} BINDIR.${_T}= ${TESTSDIR} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.c DPADD.${_T}+= ${LIBATF_C} .if empty(LDFLAGS:M-static) && empty(LDFLAGS.${_T}:M-static) LDADD.${_T}+= ${LDADD_atf_c} .else LDADD.${_T}+= ${LIBATF_C} .endif TEST_INTERFACE.${_T}= atf .endfor .endif .if !empty(ATF_TESTS_CXX) PROGS_CXX+= ${ATF_TESTS_CXX} _TESTS+= ${ATF_TESTS_CXX} .for _T in ${ATF_TESTS_CXX} BINDIR.${_T}= ${TESTSDIR} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}${CXX_SUFFIX:U.cc} DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C} .if empty(LDFLAGS:M-static) && empty(LDFLAGS.${_T}:M-static) LDADD.${_T}+= ${LDADD_atf_cxx} ${LDADD_atf_c} .else LDADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C} .endif TEST_INTERFACE.${_T}= atf .endfor .endif .if !empty(ATF_TESTS_SH) SCRIPTS+= ${ATF_TESTS_SH} _TESTS+= ${ATF_TESTS_SH} .for _T in ${ATF_TESTS_SH} SCRIPTSDIR_${_T}= ${TESTSDIR} TEST_INTERFACE.${_T}= atf CLEANFILES+= ${_T} ${_T}.tmp # TODO(jmmv): It seems to me that this SED and SRC functionality should # exist in bsd.prog.mk along the support for SCRIPTS. Move it there if # this proves to be useful within the tests. ATF_TESTS_SH_SED_${_T}?= # empty ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh ${_T}: ${ATF_TESTS_SH_SRC_${_T}} echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp .if empty(ATF_TESTS_SH_SED_${_T}) cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp .else cat ${.ALLSRC:N*Makefile*} \ | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp +.endif + chmod +x ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} +.endfor +.endif + +.if !empty(ATF_TESTS_KSH93) +SCRIPTS+= ${ATF_TESTS_KSH93} +_TESTS+= ${ATF_TESTS_KSH93} +.for _T in ${ATF_TESTS_KSH93} +SCRIPTSDIR_${_T}= ${TESTSDIR} +TEST_INTERFACE.${_T}= atf +CLEANFILES+= ${_T} ${_T}.tmp +# TODO(jmmv): It seems to me that this SED and SRC functionality should +# exist in bsd.prog.mk along the support for SCRIPTS. Move it there if +# this proves to be useful within the tests. +ATF_TESTS_KSH93_SED_${_T}?= # empty +ATF_TESTS_KSH93_SRC_${_T}?= ${_T}.sh +${_T}: ${ATF_TESTS_KSH93_SRC_${_T}} + echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp +.if empty(ATF_TESTS_KSH93_SED_${_T}) + cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp +.else + cat ${.ALLSRC:N*Makefile*} \ + | sed ${ATF_TESTS_KSH93_SED_${_T}} >>${.TARGET}.tmp .endif chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .endfor .endif