From owner-svn-src-projects@freebsd.org Wed Dec 23 20:25:03 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13064A4F8FB for ; Wed, 23 Dec 2015 20:25:03 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C524F1F96; Wed, 23 Dec 2015 20:25:02 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNKP1V7063637; Wed, 23 Dec 2015 20:25:01 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNKP1Tr063635; Wed, 23 Dec 2015 20:25:01 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512232025.tBNKP1Tr063635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 23 Dec 2015 20:25:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292666 - in projects/zfsd/head: etc/mtree share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2015 20:25:03 -0000 Author: asomers Date: Wed Dec 23 20:25:01 2015 New Revision: 292666 URL: https://svnweb.freebsd.org/changeset/base/292666 Log: Restore content accidentally reverted by r289683 etc/mtree/BSD.tests.dist Restore directory entries for the ZFS, zfsd, dtrace, and geom_part tests. share/mk/atf.test.mk Restore stuff related to the ATF_TESTS_KSH93 variable Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist projects/zfsd/head/share/mk/atf.test.mk Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist ============================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist Wed Dec 23 18:48:32 2015 (r292665) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Wed Dec 23 20:25:01 2015 (r292666) @@ -49,6 +49,8 @@ lib .. sbin + zfsd + .. .. usr.bin .. @@ -368,10 +370,286 @@ .. 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 .. @@ -384,6 +662,8 @@ .. mqueue .. + net + .. netinet .. opencrypto Modified: projects/zfsd/head/share/mk/atf.test.mk ============================================================================== --- projects/zfsd/head/share/mk/atf.test.mk Wed Dec 23 18:48:32 2015 (r292665) +++ projects/zfsd/head/share/mk/atf.test.mk Wed Dec 23 20:25:01 2015 (r292666) @@ -21,6 +21,7 @@ ATF_TESTS_C?= ATF_TESTS_CXX?= ATF_TESTS_SH?= +ATF_TESTS_KSH93?= .if !empty(ATF_TESTS_C) PROGS+= ${ATF_TESTS_C} @@ -80,3 +81,28 @@ ${_T}: ${ATF_TESTS_SH_SRC_${_T}} 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