svn commit: r292295 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: . zpool_destroy

[Alan Somers]

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 <bsd.test.mk>

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 <bsd.test.mk>