From owner-svn-src-projects@freebsd.org Tue Dec 15 23:54:08 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 5363AA48E90 for ; Tue, 15 Dec 2015 23:54:08 +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 2F45A1BA4; Tue, 15 Dec 2015 23:54:08 +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 tBFNs7jM040571; Tue, 15 Dec 2015 23:54:07 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFNs78l040569; Tue, 15 Dec 2015 23:54:07 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512152354.tBFNs78l040569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 15 Dec 2015 23:54:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292295 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: . zpool_destroy 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: Tue, 15 Dec 2015 23:54:08 -0000 Author: asomers Date: Tue Dec 15 23:54:06 2015 New Revision: 292295 URL: https://svnweb.freebsd.org/changeset/base/292295 Log: tests/sys/cddl/zfs/tests/cli_root/Makefile tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Alphabetically sort entries in Makefiles Submitted by: will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile Tue Dec 15 23:50:57 2015 (r292294) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/Makefile Tue Dec 15 23:54:06 2015 (r292295) @@ -5,52 +5,54 @@ TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root FILESDIR=${TESTSDIR} +FILES+= cleanup.ksh +FILES+= cli.cfg FILES+= cli_common.kshlib FILES+= setup.ksh -FILES+= cli.cfg -FILES+= cleanup.ksh -TESTS_SUBDIRS+= zfs_upgrade -TESTS_SUBDIRS+= zfs_promote +TESTS_SUBDIRS+= zdb + +TESTS_SUBDIRS+= zfs TESTS_SUBDIRS+= zfs_clone -TESTS_SUBDIRS+= zfs_property +TESTS_SUBDIRS+= zfs_copies +TESTS_SUBDIRS+= zfs_create TESTS_SUBDIRS+= zfs_destroy -TESTS_SUBDIRS+= zpool_create -TESTS_SUBDIRS+= zpool_history -TESTS_SUBDIRS+= zpool_expand -TESTS_SUBDIRS+= zpool_remove +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+= zdb -TESTS_SUBDIRS+= zpool_online -TESTS_SUBDIRS+= zpool_get -TESTS_SUBDIRS+= zpool_export -TESTS_SUBDIRS+= zfs_copies -TESTS_SUBDIRS+= zfs_get -TESTS_SUBDIRS+= zfs +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 TESTS_SUBDIRS+= zpool_offline +TESTS_SUBDIRS+= zpool_online +TESTS_SUBDIRS+= zpool_remove TESTS_SUBDIRS+= zpool_replace -TESTS_SUBDIRS+= zfs_rollback TESTS_SUBDIRS+= zpool_set -TESTS_SUBDIRS+= zfs_send -TESTS_SUBDIRS+= zfs_set -TESTS_SUBDIRS+= zpool_detach TESTS_SUBDIRS+= zpool_scrub -TESTS_SUBDIRS+= zfs_inherit -TESTS_SUBDIRS+= zfs_snapshot -TESTS_SUBDIRS+= zfs_share -TESTS_SUBDIRS+= zpool_destroy TESTS_SUBDIRS+= zpool_status -TESTS_SUBDIRS+= zfs_unmount -TESTS_SUBDIRS+= zfs_receive -TESTS_SUBDIRS+= zfs_create TESTS_SUBDIRS+= zpool_upgrade -TESTS_SUBDIRS+= zpool_add -TESTS_SUBDIRS+= zfs_rename -TESTS_SUBDIRS+= zpool_attach -TESTS_SUBDIRS+= zfs_reservation .include Modified: 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 Tue Dec 15 23:50:57 2015 (r292294) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile Tue Dec 15 23:54:06 2015 (r292295) @@ -7,10 +7,11 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_destroy_test -FILES+= zpool_destroy_001_pos.ksh FILES+= cleanup.ksh -FILES+= zpool_destroy_003_neg.ksh -FILES+= zpool_destroy_002_pos.ksh + FILES+= zpool_destroy.cfg +FILES+= zpool_destroy_001_pos.ksh +FILES+= zpool_destroy_002_pos.ksh +FILES+= zpool_destroy_003_neg.ksh .include