diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-27 15:16:54 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-27 15:16:54 +0000 |
| commit | 9b80da806e4b1c1660c0885bd90e593444383e40 (patch) | |
| tree | 269a7f6b9b5b79ba81dc4fead801079539e2c5fb | |
| parent | 7e8f8e64f54b3087f064936dbe90616accae169a (diff) | |
| parent | ad42deeadc90fc89c86ce30c488a778e2a0b5d68 (diff) | |
| download | illumos-joyent-9b80da806e4b1c1660c0885bd90e593444383e40.tar.gz | |
[illumos-gate merge]
commit ad42deeadc90fc89c86ce30c488a778e2a0b5d68
7512 Simplify the Makefiles in zfstest
131 files changed, 578 insertions, 3923 deletions
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 4ab04a24b6..fc7bbb8235 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -10,7 +10,7 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2015 Nexenta Systems, Inc. All rights reserved. # Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # @@ -167,19 +167,19 @@ file path=opt/zfs-tests/bin/readmmap mode=0555 file path=opt/zfs-tests/bin/rename_dir mode=0555 file path=opt/zfs-tests/bin/rm_lnkcnt_zero_file mode=0555 file path=opt/zfs-tests/bin/zfstest mode=0555 -file path=opt/zfs-tests/callbacks/zfs_dbgmsg.ksh mode=0555 -file path=opt/zfs-tests/include/commands.cfg mode=0555 -file path=opt/zfs-tests/include/default.cfg mode=0555 -file path=opt/zfs-tests/include/libtest.shlib mode=0555 -file path=opt/zfs-tests/include/math.shlib mode=0555 -file path=opt/zfs-tests/include/properties.shlib mode=0555 +file path=opt/zfs-tests/callbacks/zfs_dbgmsg mode=0555 +file path=opt/zfs-tests/include/commands.cfg mode=0444 +file path=opt/zfs-tests/include/default.cfg mode=0444 +file path=opt/zfs-tests/include/libtest.shlib mode=0444 +file path=opt/zfs-tests/include/math.shlib mode=0444 +file path=opt/zfs-tests/include/properties.shlib mode=0444 file path=opt/zfs-tests/runfiles/delphix.run mode=0444 file path=opt/zfs-tests/runfiles/omnios.run mode=0444 file path=opt/zfs-tests/runfiles/openindiana.run mode=0444 file path=opt/zfs-tests/runfiles/perf-regression.run mode=0444 -file path=opt/zfs-tests/tests/functional/acl/acl.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/acl/acl_common.kshlib mode=0555 -file path=opt/zfs-tests/tests/functional/acl/cifs/cifs.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/acl/acl.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/acl/acl_common.kshlib mode=0444 +file path=opt/zfs-tests/tests/functional/acl/cifs/cifs.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/acl/cifs/cifs_attr_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/acl/cifs/cifs_attr_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/acl/cifs/cifs_attr_003_pos mode=0555 @@ -303,10 +303,10 @@ file path=opt/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_002_neg \ mode=0555 -file path=opt/zfs-tests/tests/functional/atime/atime.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/atime/atime.cfg mode=0444 file path=opt/zfs-tests/tests/functional/atime/atime_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/atime/atime_002_neg mode=0555 -file path=opt/zfs-tests/tests/functional/atime/atime_common.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/atime/atime_common.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/atime/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/atime/setup mode=0555 file path=opt/zfs-tests/tests/functional/bootfs/bootfs_001_pos mode=0555 @@ -317,8 +317,8 @@ file path=opt/zfs-tests/tests/functional/bootfs/bootfs_005_neg mode=0555 file path=opt/zfs-tests/tests/functional/bootfs/bootfs_006_pos mode=0555 file path=opt/zfs-tests/tests/functional/bootfs/bootfs_007_pos mode=0555 file path=opt/zfs-tests/tests/functional/bootfs/bootfs_008_pos mode=0555 -file path=opt/zfs-tests/tests/functional/cache/cache.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/cache/cache.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/cache/cache.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/cache/cache.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/cache/cache_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/cache/cache_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/cache/cache_003_pos mode=0555 @@ -332,8 +332,8 @@ file path=opt/zfs-tests/tests/functional/cache/cache_010_neg mode=0555 file path=opt/zfs-tests/tests/functional/cache/cache_011_pos mode=0555 file path=opt/zfs-tests/tests/functional/cache/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cache/setup mode=0555 -file path=opt/zfs-tests/tests/functional/cachefile/cachefile.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/cachefile/cachefile.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/cachefile/cachefile.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/cachefile/cachefile.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/cachefile/cachefile_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/cachefile/cachefile_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/cachefile/cachefile_003_pos mode=0555 @@ -405,11 +405,11 @@ file path=opt/zfs-tests/tests/functional/clean_mirror/clean_mirror_004_pos \ mode=0555 file \ path=opt/zfs-tests/tests/functional/clean_mirror/clean_mirror_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/clean_mirror/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/clean_mirror/default.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/clean_mirror/default.cfg mode=0444 file path=opt/zfs-tests/tests/functional/clean_mirror/setup mode=0555 -file path=opt/zfs-tests/tests/functional/cli_root/cli_common.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/cli_root/cli_common.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zdb/zdb_001_neg mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zdb/zdb_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs/cleanup mode=0555 @@ -442,9 +442,9 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos \ file path=opt/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_copies/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_001_pos \ mode=0555 @@ -465,10 +465,10 @@ file \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_create/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_create/properties.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_create/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_001_pos \ mode=0555 @@ -510,12 +510,12 @@ file \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos \ mode=0555 @@ -566,7 +566,7 @@ file \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_get/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_get/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_001_pos \ @@ -591,10 +591,10 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_010_neg \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_inherit/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_inherit/setup mode=0555 @@ -610,9 +610,9 @@ file \ file path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_002_pos \ @@ -644,7 +644,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_promote/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_promote/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_001_pos \ mode=0555 @@ -720,9 +720,9 @@ file \ file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_001_pos \ mode=0555 @@ -777,7 +777,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_rollback/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zfs_rollback/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_001_pos \ mode=0555 @@ -792,11 +792,11 @@ file \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_send/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_send/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_002_pos \ @@ -872,11 +872,11 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_003_neg \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_share/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_share/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_002_pos \ @@ -904,7 +904,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_snapshot/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zfs_snapshot/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_001_neg \ mode=0555 @@ -936,10 +936,10 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_unmount/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_unmount/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_001_pos \ mode=0555 @@ -993,7 +993,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_upgrade/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zfs_upgrade/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos \ mode=0555 @@ -1026,9 +1026,9 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos \ file path=opt/zfs-tests/tests/functional/cli_root/zpool_add/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_add/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_002_pos \ @@ -1057,7 +1057,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_clear/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_clear/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos \ mode=0555 @@ -1072,10 +1072,10 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_create/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zpool_create/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_001_pos \ mode=0555 @@ -1156,7 +1156,7 @@ file \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos \ mode=0555 @@ -1177,7 +1177,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_expand/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zpool_expand/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos \ mode=0555 @@ -1205,7 +1205,7 @@ file \ file path=opt/zfs-tests/tests/functional/cli_root/zpool_get/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_get/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos \ @@ -1232,7 +1232,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_import/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zpool_import/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos \ mode=0555 @@ -1320,7 +1320,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_remove/cleanup \ file path=opt/zfs-tests/tests/functional/cli_root/zpool_remove/setup mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_001_neg \ mode=0555 @@ -1341,7 +1341,7 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_scrub/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_scrub/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_001_neg \ mode=0555 @@ -1534,10 +1534,10 @@ file path=opt/zfs-tests/tests/functional/cli_root/zpool_upgrade/setup \ mode=0555 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.cfg \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib \ - mode=0555 + mode=0444 file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_001_pos \ mode=0555 @@ -1566,7 +1566,7 @@ file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_009_neg \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_user/misc/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/cli_user/misc/misc.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/cli_user/misc/misc.cfg mode=0444 file path=opt/zfs-tests/tests/functional/cli_user/misc/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg mode=0555 file path=opt/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg mode=0555 @@ -1650,9 +1650,9 @@ file path=opt/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg \ file path=opt/zfs-tests/tests/functional/cli_user/zfs_list/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/cli_user/zfs_list/setup mode=0555 file path=opt/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_002_pos \ @@ -1686,7 +1686,7 @@ file \ path=opt/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_002_neg \ mode=0555 file path=opt/zfs-tests/tests/functional/compression/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/compression/compress.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/compression/compress.cfg mode=0444 file path=opt/zfs-tests/tests/functional/compression/compress_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/compression/compress_002_pos \ @@ -1700,9 +1700,9 @@ file path=opt/zfs-tests/tests/functional/ctime/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/ctime/ctime_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/ctime/setup mode=0555 file path=opt/zfs-tests/tests/functional/delegate/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/delegate/delegate.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/delegate/delegate.cfg mode=0444 file path=opt/zfs-tests/tests/functional/delegate/delegate_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/delegate/setup mode=0555 file path=opt/zfs-tests/tests/functional/delegate/zfs_allow_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/delegate/zfs_allow_002_pos mode=0555 @@ -1733,12 +1733,12 @@ file path=opt/zfs-tests/tests/functional/delegate/zfs_unallow_007_neg \ file path=opt/zfs-tests/tests/functional/delegate/zfs_unallow_008_neg \ mode=0555 file path=opt/zfs-tests/tests/functional/devices/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/devices/devices.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/devices/devices.cfg mode=0444 file path=opt/zfs-tests/tests/functional/devices/devices_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/devices/devices_002_neg mode=0555 file path=opt/zfs-tests/tests/functional/devices/devices_003_pos mode=0555 file path=opt/zfs-tests/tests/functional/devices/devices_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/devices/setup mode=0555 file path=opt/zfs-tests/tests/functional/exec/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/exec/exec_001_pos mode=0555 @@ -1753,15 +1753,15 @@ file path=opt/zfs-tests/tests/functional/features/async_destroy/cleanup \ file path=opt/zfs-tests/tests/functional/features/async_destroy/setup \ mode=0555 file path=opt/zfs-tests/tests/functional/grow_pool/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/grow_pool/grow_pool.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/grow_pool/grow_pool.cfg mode=0444 file path=opt/zfs-tests/tests/functional/grow_pool/grow_pool_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/grow_pool/setup mode=0555 file path=opt/zfs-tests/tests/functional/grow_replicas/grow_replicas.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/grow_replicas/grow_replicas_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/history/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/history/history.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/history/history.cfg mode=0444 file path=opt/zfs-tests/tests/functional/history/history_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/history/history_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/history/history_003_pos mode=0555 @@ -1773,7 +1773,7 @@ file path=opt/zfs-tests/tests/functional/history/history_008_pos mode=0555 file path=opt/zfs-tests/tests/functional/history/history_009_pos mode=0555 file path=opt/zfs-tests/tests/functional/history/history_010_pos mode=0555 file path=opt/zfs-tests/tests/functional/history/history_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/history/i386.migratedpool.DAT.Z \ mode=0444 file path=opt/zfs-tests/tests/functional/history/i386.orig_history.txt \ @@ -1785,61 +1785,61 @@ file path=opt/zfs-tests/tests/functional/history/sparc.orig_history.txt \ mode=0444 file path=opt/zfs-tests/tests/functional/history/zfs-pool-v4.dat.Z mode=0444 file path=opt/zfs-tests/tests/functional/holes/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/holes/holes.shlib mode=0555 +file path=opt/zfs-tests/tests/functional/holes/holes.shlib mode=0444 file path=opt/zfs-tests/tests/functional/holes/holes_sanity mode=0555 file path=opt/zfs-tests/tests/functional/holes/setup mode=0555 file path=opt/zfs-tests/tests/functional/inheritance/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config001.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config002.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config003.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config004.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config005.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config006.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config007.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config008.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config009.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config010.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config011.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config012.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config013.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config014.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config015.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config016.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config017.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config018.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config019.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config020.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config021.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config022.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config023.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/config024.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/inherit.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/inheritance/config001.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config002.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config003.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config004.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config005.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config006.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config007.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config008.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config009.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config010.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config011.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config012.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config013.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config014.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config015.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config016.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config017.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config018.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config019.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config020.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config021.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config022.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config023.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/config024.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/inherit.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/inheritance/inherit_001_pos mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state001.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state002.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state003.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state004.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state005.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state006.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state007.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state008.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state009.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state010.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state011.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state012.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state013.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state014.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state015.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state016.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state017.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state018.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state019.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state020.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state021.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state022.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state023.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inheritance/state024.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/inuse/inuse.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/inheritance/state001.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state002.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state003.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state004.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state005.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state006.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state007.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state008.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state009.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state010.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state011.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state012.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state013.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state014.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state015.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state016.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state017.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state018.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state019.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state020.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state021.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state022.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state023.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inheritance/state024.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/inuse/inuse.cfg mode=0444 file path=opt/zfs-tests/tests/functional/inuse/inuse_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/inuse/inuse_003_pos mode=0555 file path=opt/zfs-tests/tests/functional/inuse/inuse_004_pos mode=0555 @@ -1854,7 +1854,7 @@ file path=opt/zfs-tests/tests/functional/large_files/large_files_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/large_files/setup mode=0555 file path=opt/zfs-tests/tests/functional/largest_pool/largest_pool.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/libzfs/many_fds mode=0555 @@ -1865,8 +1865,8 @@ file path=opt/zfs-tests/tests/functional/mdb/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/mdb/mdb_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/mdb/setup mode=0555 file path=opt/zfs-tests/tests/functional/migration/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/migration/migration.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/migration/migration.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/migration/migration.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/migration/migration.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/migration/migration_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/migration/migration_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/migration/migration_003_pos mode=0555 @@ -1889,22 +1889,22 @@ file path=opt/zfs-tests/tests/functional/mount/setup mode=0555 file path=opt/zfs-tests/tests/functional/mount/umount_001 mode=0555 file path=opt/zfs-tests/tests/functional/mount/umountall_001 mode=0555 file path=opt/zfs-tests/tests/functional/mv_files/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/mv_files/mv_files.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/mv_files/mv_files.cfg mode=0444 file path=opt/zfs-tests/tests/functional/mv_files/mv_files_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/mv_files/mv_files_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/mv_files/setup mode=0555 file path=opt/zfs-tests/tests/functional/nestedfs/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/nestedfs/nestedfs_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/nestedfs/setup mode=0555 file path=opt/zfs-tests/tests/functional/no_space/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/no_space/enospc.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/no_space/enospc.cfg mode=0444 file path=opt/zfs-tests/tests/functional/no_space/enospc_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/no_space/enospc_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/no_space/setup mode=0555 file path=opt/zfs-tests/tests/functional/nopwrite/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/nopwrite/nopwrite.shlib mode=0555 +file path=opt/zfs-tests/tests/functional/nopwrite/nopwrite.shlib mode=0444 file path=opt/zfs-tests/tests/functional/nopwrite/nopwrite_copies mode=0555 file path=opt/zfs-tests/tests/functional/nopwrite/nopwrite_mtime mode=0555 file path=opt/zfs-tests/tests/functional/nopwrite/nopwrite_negative mode=0555 @@ -1939,8 +1939,8 @@ file path=opt/zfs-tests/tests/functional/privilege/privilege_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/privilege/privilege_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/privilege/setup mode=0555 file path=opt/zfs-tests/tests/functional/quota/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/quota/quota.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/quota/quota.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/quota/quota.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/quota/quota.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/quota/quota_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/quota/quota_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/quota/quota_003_pos mode=0555 @@ -1949,9 +1949,9 @@ file path=opt/zfs-tests/tests/functional/quota/quota_005_pos mode=0555 file path=opt/zfs-tests/tests/functional/quota/quota_006_neg mode=0555 file path=opt/zfs-tests/tests/functional/quota/setup mode=0555 file path=opt/zfs-tests/tests/functional/redundancy/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/redundancy/redundancy.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/redundancy/redundancy.cfg mode=0444 file path=opt/zfs-tests/tests/functional/redundancy/redundancy.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/redundancy/redundancy_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/redundancy/redundancy_002_pos \ @@ -1970,7 +1970,7 @@ file path=opt/zfs-tests/tests/functional/refquota/refquota_005_pos mode=0555 file path=opt/zfs-tests/tests/functional/refquota/refquota_006_neg mode=0555 file path=opt/zfs-tests/tests/functional/refquota/setup mode=0555 file path=opt/zfs-tests/tests/functional/refreserv/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/refreserv/refreserv.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/refreserv/refreserv.cfg mode=0444 file path=opt/zfs-tests/tests/functional/refreserv/refreserv_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/refreserv/refreserv_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/refreserv/refreserv_003_pos mode=0555 @@ -1982,7 +1982,7 @@ file path=opt/zfs-tests/tests/functional/rename_dirs/rename_dirs_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/rename_dirs/setup mode=0555 file path=opt/zfs-tests/tests/functional/replacement/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/replacement/replacement.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/replacement/replacement.cfg mode=0444 file path=opt/zfs-tests/tests/functional/replacement/replacement_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/replacement/replacement_002_pos \ @@ -1991,9 +1991,9 @@ file path=opt/zfs-tests/tests/functional/replacement/replacement_003_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/replacement/setup mode=0555 file path=opt/zfs-tests/tests/functional/reservation/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/reservation/reservation.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/reservation/reservation.cfg mode=0444 file path=opt/zfs-tests/tests/functional/reservation/reservation.shlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/reservation/reservation_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/reservation/reservation_002_pos \ @@ -2037,8 +2037,8 @@ file path=opt/zfs-tests/tests/functional/rootpool/rootpool_003_neg mode=0555 file path=opt/zfs-tests/tests/functional/rootpool/rootpool_007_pos mode=0555 file path=opt/zfs-tests/tests/functional/rootpool/setup mode=0555 file path=opt/zfs-tests/tests/functional/rsend/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/rsend/rsend.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/rsend/rsend.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/rsend/rsend.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/rsend/rsend.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/rsend/rsend_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/rsend/rsend_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/rsend/rsend_003_pos mode=0555 @@ -2081,7 +2081,7 @@ file path=opt/zfs-tests/tests/functional/rsend/send-cpL_varied_recsize \ mode=0555 file path=opt/zfs-tests/tests/functional/rsend/setup mode=0555 file path=opt/zfs-tests/tests/functional/scrub_mirror/cleanup mode=0555 -file path=opt/zfs-tests/tests/functional/scrub_mirror/default.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/scrub_mirror/default.cfg mode=0444 file path=opt/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_002_pos \ @@ -2092,12 +2092,12 @@ file path=opt/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_004_pos \ mode=0555 file \ path=opt/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/scrub_mirror/setup mode=0555 file path=opt/zfs-tests/tests/functional/slog/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/slog/setup mode=0555 -file path=opt/zfs-tests/tests/functional/slog/slog.cfg mode=0555 -file path=opt/zfs-tests/tests/functional/slog/slog.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/slog/slog.cfg mode=0444 +file path=opt/zfs-tests/tests/functional/slog/slog.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/slog/slog_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/slog/slog_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/slog/slog_003_pos mode=0555 @@ -2118,7 +2118,7 @@ file path=opt/zfs-tests/tests/functional/snapshot/rollback_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapshot/rollback_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapshot/rollback_003_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapshot/setup mode=0555 -file path=opt/zfs-tests/tests/functional/snapshot/snapshot.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/snapshot/snapshot.cfg mode=0444 file path=opt/zfs-tests/tests/functional/snapshot/snapshot_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapshot/snapshot_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapshot/snapshot_003_pos mode=0555 @@ -2138,7 +2138,7 @@ file path=opt/zfs-tests/tests/functional/snapshot/snapshot_016_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapshot/snapshot_017_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapused/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/snapused/setup mode=0555 -file path=opt/zfs-tests/tests/functional/snapused/snapused.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/snapused/snapused.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/snapused/snapused_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapused/snapused_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapused/snapused_003_pos mode=0555 @@ -2146,7 +2146,7 @@ file path=opt/zfs-tests/tests/functional/snapused/snapused_004_pos mode=0555 file path=opt/zfs-tests/tests/functional/snapused/snapused_005_pos mode=0555 file path=opt/zfs-tests/tests/functional/sparse/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/sparse/setup mode=0555 -file path=opt/zfs-tests/tests/functional/sparse/sparse.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/sparse/sparse.cfg mode=0444 file path=opt/zfs-tests/tests/functional/sparse/sparse_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/threadsappend/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/threadsappend/setup mode=0555 @@ -2155,7 +2155,7 @@ file path=opt/zfs-tests/tests/functional/threadsappend/threadsappend_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/truncate/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/truncate/setup mode=0555 -file path=opt/zfs-tests/tests/functional/truncate/truncate.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/truncate/truncate.cfg mode=0444 file path=opt/zfs-tests/tests/functional/truncate/truncate_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/truncate/truncate_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/userquota/cleanup mode=0555 @@ -2164,7 +2164,7 @@ file path=opt/zfs-tests/tests/functional/userquota/groupspace_001_pos \ file path=opt/zfs-tests/tests/functional/userquota/groupspace_002_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/userquota/setup mode=0555 -file path=opt/zfs-tests/tests/functional/userquota/userquota.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/userquota/userquota.cfg mode=0444 file path=opt/zfs-tests/tests/functional/userquota/userquota_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/userquota/userquota_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/userquota/userquota_003_pos mode=0555 @@ -2178,14 +2178,14 @@ file path=opt/zfs-tests/tests/functional/userquota/userquota_010_pos mode=0555 file path=opt/zfs-tests/tests/functional/userquota/userquota_011_pos mode=0555 file path=opt/zfs-tests/tests/functional/userquota/userquota_012_neg mode=0555 file path=opt/zfs-tests/tests/functional/userquota/userquota_common.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/userquota/userspace_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/userquota/userspace_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/utils_test/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/utils_test/setup mode=0555 -file path=opt/zfs-tests/tests/functional/utils_test/utils_test.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/utils_test/utils_test.cfg mode=0444 file path=opt/zfs-tests/tests/functional/utils_test/utils_test.kshlib \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/utils_test/utils_test_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/utils_test/utils_test_002_pos \ @@ -2206,7 +2206,7 @@ file path=opt/zfs-tests/tests/functional/utils_test/utils_test_009_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/vdev_zaps/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/vdev_zaps/setup mode=0555 -file path=opt/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib mode=0555 +file path=opt/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib mode=0444 file path=opt/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_001_pos mode=0555 file path=opt/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_002_pos mode=0555 file path=opt/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_003_pos mode=0555 @@ -2235,8 +2235,8 @@ file path=opt/zfs-tests/tests/functional/xattr/xattr_010_neg mode=0555 file path=opt/zfs-tests/tests/functional/xattr/xattr_011_pos mode=0555 file path=opt/zfs-tests/tests/functional/xattr/xattr_012_pos mode=0555 file path=opt/zfs-tests/tests/functional/xattr/xattr_013_pos mode=0555 -file path=opt/zfs-tests/tests/functional/xattr/xattr_common.kshlib mode=0555 -file path=opt/zfs-tests/tests/functional/zvol/zvol.cfg mode=0555 +file path=opt/zfs-tests/tests/functional/xattr/xattr_common.kshlib mode=0444 +file path=opt/zfs-tests/tests/functional/zvol/zvol.cfg mode=0444 file path=opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos \ @@ -2249,7 +2249,7 @@ file path=opt/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_002_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_003_neg \ mode=0555 -file path=opt/zfs-tests/tests/functional/zvol/zvol_common.shlib mode=0555 +file path=opt/zfs-tests/tests/functional/zvol/zvol_common.shlib mode=0444 file path=opt/zfs-tests/tests/functional/zvol/zvol_misc/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_misc/setup mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg \ @@ -2267,7 +2267,7 @@ file path=opt/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos \ file path=opt/zfs-tests/tests/functional/zvol/zvol_swap/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_swap/setup mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap.cfg \ - mode=0555 + mode=0444 file path=opt/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos \ @@ -2286,7 +2286,7 @@ file path=opt/zfs-tests/tests/perf/fio/random_readwrite.fio mode=0444 file path=opt/zfs-tests/tests/perf/fio/random_writes.fio mode=0444 file path=opt/zfs-tests/tests/perf/fio/sequential_reads.fio mode=0444 file path=opt/zfs-tests/tests/perf/fio/sequential_writes.fio mode=0444 -file path=opt/zfs-tests/tests/perf/perf.shlib mode=0555 +file path=opt/zfs-tests/tests/perf/perf.shlib mode=0444 file path=opt/zfs-tests/tests/perf/regression/random_reads mode=0555 file path=opt/zfs-tests/tests/perf/regression/random_readwrite mode=0555 file path=opt/zfs-tests/tests/perf/regression/random_writes mode=0555 @@ -2297,8 +2297,8 @@ file path=opt/zfs-tests/tests/perf/regression/sequential_reads_cached_clone \ mode=0555 file path=opt/zfs-tests/tests/perf/regression/sequential_writes mode=0555 file path=opt/zfs-tests/tests/perf/regression/setup mode=0555 -file path=opt/zfs-tests/tests/perf/scripts/io.d mode=0555 -file path=opt/zfs-tests/tests/perf/scripts/prefetch_io.d mode=0555 +file path=opt/zfs-tests/tests/perf/scripts/io.d mode=0444 +file path=opt/zfs-tests/tests/perf/scripts/prefetch_io.d mode=0444 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL depend fmri=system/file-system/zfs/tests type=require diff --git a/usr/src/test/zfs-tests/Makefile b/usr/src/test/zfs-tests/Makefile index 135e5d2050..0c7218867a 100644 --- a/usr/src/test/zfs-tests/Makefile +++ b/usr/src/test/zfs-tests/Makefile @@ -15,6 +15,6 @@ .PARALLEL: $(SUBDIRS) -SUBDIRS = cmd include runfiles tests doc callbacks +SUBDIRS:sh = find ./* -type d -maxdepth 0 include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/Makefile.com b/usr/src/test/zfs-tests/Makefile.com new file mode 100644 index 0000000000..b05381cbf7 --- /dev/null +++ b/usr/src/test/zfs-tests/Makefile.com @@ -0,0 +1,51 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2016 by Delphix. All rights reserved. +# + +# The following file name generation rules allow the addition of tests, +# libraries and other miscellaneous files without having to specify them +# all individually in lower level Makefiles. +PROGS:sh = echo ~(N)*(*.sh|*.ksh) +FILES:sh = echo ~(N)*(*.cfg|*shlib|*.run|*.bz2|*.d|*.fio) +FILES:sh += echo ~(N)*(*.Z|*.txt|*.out|*.err|*.zcp) + +CMDS = $(PROGS:%.sh=$(TARGETDIR)/%) +CMDS += $(PROGS:%.ksh=$(TARGETDIR)/%) +$(CMDS) := FILEMODE = 0555 + +LIBS = $(FILES:%=$(TARGETDIR)/%) +$(LIBS) := FILEMODE = 0444 + +all lint clean clobber: + +install: $(CMDS) $(LIBS) + +$(CMDS): $(TARGETDIR) + +$(LIBS): $(TARGETDIR) + +$(TARGETDIR): + $(INS.dir) + +$(TARGETDIR)/%: %.sh + $(INS.rename) + +$(TARGETDIR)/%: %.ksh + $(INS.rename) + +$(TARGETDIR)/%: % + $(INS.file) + +.PARALLEL: $(SUBDIRS) +SUBDIRS:sh = find ./* -maxdepth 0 -type d diff --git a/usr/src/test/zfs-tests/callbacks/Makefile b/usr/src/test/zfs-tests/callbacks/Makefile index c951206a96..8230ca13e3 100644 --- a/usr/src/test/zfs-tests/callbacks/Makefile +++ b/usr/src/test/zfs-tests/callbacks/Makefile @@ -15,22 +15,7 @@ include $(SRC)/Makefile.master -CALLBACKS = zfs_dbgmsg.ksh - ROOTOPTPKG = $(ROOT)/opt/zfs-tests -CALLBACKSDIR = $(ROOTOPTPKG)/callbacks - -FILES = $(CALLBACKS:%=$(CALLBACKSDIR)/%) -$(FILES) := FILEMODE = 0555 - -all: $(CALLBACKS) - -install: $(CALLBACKSDIR) $(FILES) - -clean lint clobber: - -$(CALLBACKSDIR): - $(INS.dir) +TARGETDIR = $(ROOTOPTPKG)/callbacks -$(CALLBACKSDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/cmd/Makefile b/usr/src/test/zfs-tests/cmd/Makefile index 5bc6db13c3..8b6356392f 100644 --- a/usr/src/test/zfs-tests/cmd/Makefile +++ b/usr/src/test/zfs-tests/cmd/Makefile @@ -10,28 +10,8 @@ # # -# Copyright (c) 2012, 2014 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - -SUBDIRS = chg_usr_exec \ - devname2devid \ - dir_rd_update \ - file_check \ - file_trunc \ - file_write \ - getholes \ - largest_file \ - mkbusy \ - mkfiles \ - mkholes \ - mktree \ - mmapwrite \ - randfree_file \ - readmmap \ - rename_dir \ - rm_lnkcnt_zero_file \ - scripts - +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/cmd/Makefile.subdirs b/usr/src/test/zfs-tests/cmd/Makefile.subdirs index 05fa61de69..0b1a353848 100644 --- a/usr/src/test/zfs-tests/cmd/Makefile.subdirs +++ b/usr/src/test/zfs-tests/cmd/Makefile.subdirs @@ -10,7 +10,7 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/test/Makefile.com @@ -24,6 +24,7 @@ SRCS = $(OBJS:%.o=%.c) CMDS = $(PROG:%=$(ROOTBIN)/%) $(CMDS) := FILEMODE = 0555 +C99MODE = $(C99_ENABLE) CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 all: $(PROG) diff --git a/usr/src/test/zfs-tests/cmd/mkfiles/Makefile b/usr/src/test/zfs-tests/cmd/mkfiles/Makefile index 7e833fefb1..e45366fa4d 100644 --- a/usr/src/test/zfs-tests/cmd/mkfiles/Makefile +++ b/usr/src/test/zfs-tests/cmd/mkfiles/Makefile @@ -18,6 +18,5 @@ PROG = mkfiles include $(SRC)/cmd/Makefile.cmd LDLIBS += -lc -C99MODE = -xc99=%all include ../Makefile.subdirs diff --git a/usr/src/test/zfs-tests/cmd/scripts/Makefile b/usr/src/test/zfs-tests/cmd/scripts/Makefile index 4454378adb..bd92c72937 100644 --- a/usr/src/test/zfs-tests/cmd/scripts/Makefile +++ b/usr/src/test/zfs-tests/cmd/scripts/Makefile @@ -10,27 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -ROOTBIN = $(ROOTOPTPKG)/bin +TARGETDIR = $(ROOTOPTPKG)/bin -PROGS = zfstest - -CMDS = $(PROGS:%=$(ROOTBIN)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(ROOTBIN) - -$(ROOTBIN): - $(INS.dir) - -$(ROOTBIN)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh index 5bbf4f02d1..6b492058e2 100644 --- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh +++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh @@ -26,7 +26,7 @@ runner="/opt/test-runner/bin/run" auto_detect=false if [[ -z "$TESTFAIL_CALLBACKS" ]] ; then - export TESTFAIL_CALLBACKS="$STF_SUITE/callbacks/zfs_dbgmsg.ksh" + export TESTFAIL_CALLBACKS="$STF_SUITE/callbacks/zfs_dbgmsg" fi function fail diff --git a/usr/src/test/zfs-tests/include/Makefile b/usr/src/test/zfs-tests/include/Makefile index 82c00da07e..b127bcba47 100644 --- a/usr/src/test/zfs-tests/include/Makefile +++ b/usr/src/test/zfs-tests/include/Makefile @@ -10,35 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/test/Makefile.com - include $(SRC)/Makefile.master -SRCS = commands.cfg \ - default.cfg \ - libtest.shlib \ - math.shlib \ - properties.shlib - ROOTOPTPKG = $(ROOT)/opt/zfs-tests -INCLUDEDIR = $(ROOTOPTPKG)/include - -CMDS = $(SRCS:%=$(INCLUDEDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all: $(SRCS) - -install: $(CMDS) - -clean lint clobber: - -$(CMDS): $(INCLUDEDIR) $(SRCS) - -$(INCLUDEDIR): - $(INS.dir) +TARGETDIR = $(ROOTOPTPKG)/include -$(INCLUDEDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/runfiles/Makefile b/usr/src/test/zfs-tests/runfiles/Makefile index 039a0caff3..0ed7ce8ccf 100644 --- a/usr/src/test/zfs-tests/runfiles/Makefile +++ b/usr/src/test/zfs-tests/runfiles/Makefile @@ -10,33 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. # include $(SRC)/Makefile.master -SRCS = delphix.run \ - openindiana.run \ - omnios.run \ - perf-regression.run - ROOTOPTPKG = $(ROOT)/opt/zfs-tests -RUNFILES = $(ROOTOPTPKG)/runfiles - -CMDS = $(SRCS:%=$(RUNFILES)/%) -$(CMDS) := FILEMODE = 0444 - -all: $(SRCS) - -install: $(CMDS) - -clean lint clobber: - -$(CMDS): $(RUNFILES) $(SRCS) - -$(RUNFILES): - $(INS.dir) +TARGETDIR = $(ROOTOPTPKG)/runfiles -$(RUNFILES)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/Makefile b/usr/src/test/zfs-tests/tests/Makefile index 0f569c9400..8b6356392f 100644 --- a/usr/src/test/zfs-tests/tests/Makefile +++ b/usr/src/test/zfs-tests/tests/Makefile @@ -10,11 +10,8 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - -SUBDIRS = functional perf - +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/Makefile b/usr/src/test/zfs-tests/tests/functional/Makefile index f2247b0219..a39a9b1805 100644 --- a/usr/src/test/zfs-tests/tests/functional/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/Makefile @@ -10,71 +10,9 @@ # # -# Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # Copyright 2015 Nexenta Systems, Inc. All rights reserved. # -.PARALLEL: $(SUBDIRS) - -SUBDIRS = acl \ - atime \ - bootfs \ - cache \ - cachefile \ - casenorm \ - checksum \ - clean_mirror \ - cli_root \ - cli_user \ - compression \ - ctime \ - delegate \ - devices \ - exec \ - features \ - grow_pool \ - grow_replicas \ - history \ - holes \ - inheritance \ - inuse \ - large_files \ - largest_pool \ - libzfs \ - link_count \ - mdb \ - migration \ - mmap \ - mount \ - mv_files \ - nestedfs \ - no_space \ - nopwrite \ - online_offline \ - pool_names \ - poolversion \ - privilege \ - quota \ - redundancy \ - refquota \ - refreserv \ - rename_dirs \ - replacement \ - reservation \ - rootpool \ - rsend \ - scrub_mirror \ - slog \ - snapshot \ - snapused \ - sparse \ - threadsappend \ - truncate \ - userquota \ - utils_test \ - vdev_zaps \ - write_dirs \ - xattr \ - zvol - +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/acl/Makefile b/usr/src/test/zfs-tests/tests/functional/acl/Makefile index a8cf7083d1..6996299bf3 100644 --- a/usr/src/test/zfs-tests/tests/functional/acl/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/acl/Makefile @@ -10,34 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/acl - -PROGS = acl.cfg \ - acl_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -SUBDIRS = cifs nontrivial trivial +TARGETDIR = $(ROOTOPTPKG)/tests/functional/acl +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/Makefile b/usr/src/test/zfs-tests/tests/functional/acl/cifs/Makefile index 431e58afa6..94cfed2b22 100644 --- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/acl/cifs +TARGETDIR = $(ROOTOPTPKG)/tests/functional/acl/cifs -PROGS = cleanup \ - setup \ - cifs_attr_001_pos \ - cifs_attr_002_pos \ - cifs_attr_003_pos - -FILES = cifs.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/Makefile b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/Makefile index 047170a3c3..b71dd95584 100644 --- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/Makefile @@ -10,56 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/acl/nontrivial +TARGETDIR = $(ROOTOPTPKG)/tests/functional/acl/nontrivial -PROGS = cleanup \ - setup \ - zfs_acl_aclmode_restricted_001_neg \ - zfs_acl_chmod_001_neg \ - zfs_acl_chmod_002_pos \ - zfs_acl_chmod_aclmode_001_pos \ - zfs_acl_chmod_compact_001_pos \ - zfs_acl_chmod_delete_001_pos \ - zfs_acl_chmod_inherit_001_pos \ - zfs_acl_chmod_inherit_002_neg \ - zfs_acl_chmod_inherit_002_pos \ - zfs_acl_chmod_inherit_003_pos \ - zfs_acl_chmod_inherit_004_pos \ - zfs_acl_chmod_owner_001_pos \ - zfs_acl_chmod_rwacl_001_pos \ - zfs_acl_chmod_rwx_001_pos \ - zfs_acl_chmod_rwx_002_pos \ - zfs_acl_chmod_rwx_003_pos \ - zfs_acl_chmod_rwx_004_pos \ - zfs_acl_chmod_xattr_001_pos \ - zfs_acl_chmod_xattr_002_pos \ - zfs_acl_cp_001_pos \ - zfs_acl_cp_002_pos \ - zfs_acl_cpio_001_pos \ - zfs_acl_cpio_002_pos \ - zfs_acl_find_001_pos \ - zfs_acl_ls_001_pos \ - zfs_acl_mv_001_pos \ - zfs_acl_tar_001_pos \ - zfs_acl_tar_002_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/Makefile b/usr/src/test/zfs-tests/tests/functional/acl/trivial/Makefile index 07ee251710..3c1a40d2c2 100644 --- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/Makefile @@ -10,48 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/acl/trivial +TARGETDIR = $(ROOTOPTPKG)/tests/functional/acl/trivial -PROGS = cleanup \ - setup \ - zfs_acl_aclmode_restricted_001_pos \ - zfs_acl_chmod_001_pos \ - zfs_acl_compress_001_pos \ - zfs_acl_cp_001_pos \ - zfs_acl_cp_002_neg \ - zfs_acl_cp_003_neg \ - zfs_acl_find_001_pos \ - zfs_acl_find_002_neg \ - zfs_acl_ls_001_pos \ - zfs_acl_ls_002_neg \ - zfs_acl_mv_001_pos \ - zfs_acl_pack_001_pos \ - zfs_acl_pax_001_pos \ - zfs_acl_pax_002_pos \ - zfs_acl_pax_003_pos \ - zfs_acl_pax_004_pos \ - zfs_acl_pax_005_pos \ - zfs_acl_pax_006_pos \ - zfs_acl_tar_001_pos \ - zfs_acl_tar_002_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/atime/Makefile b/usr/src/test/zfs-tests/tests/functional/atime/Makefile index 0fd91c006d..f7a619c806 100644 --- a/usr/src/test/zfs-tests/tests/functional/atime/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/atime/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/atime +TARGETDIR = $(ROOTOPTPKG)/tests/functional/atime -PROGS = cleanup \ - setup \ - atime_001_pos \ - atime_002_neg - -FILES = atime.cfg \ - atime_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/Makefile b/usr/src/test/zfs-tests/tests/functional/bootfs/Makefile index 821c182352..9ba8eda2a6 100644 --- a/usr/src/test/zfs-tests/tests/functional/bootfs/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/bootfs/Makefile @@ -10,38 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2015 Nexenta Systems, Inc. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/bootfs +TARGETDIR = $(ROOTOPTPKG)/tests/functional/bootfs -PROGS = bootfs_001_pos \ - bootfs_002_neg \ - bootfs_003_pos \ - bootfs_004_neg \ - bootfs_005_neg \ - bootfs_006_pos \ - bootfs_007_pos \ - bootfs_008_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%.cfg: %.cfg - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cache/Makefile b/usr/src/test/zfs-tests/tests/functional/cache/Makefile index d687c6d946..61be834dbf 100644 --- a/usr/src/test/zfs-tests/tests/functional/cache/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cache/Makefile @@ -10,45 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cache +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cache -PROGS = cleanup \ - setup \ - cache_001_pos \ - cache_002_pos \ - cache_003_pos \ - cache_004_neg \ - cache_005_neg \ - cache_006_pos \ - cache_007_neg \ - cache_008_neg \ - cache_009_pos \ - cache_010_neg \ - cache_011_pos - -FILES = cache.cfg \ - cache.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cachefile/Makefile b/usr/src/test/zfs-tests/tests/functional/cachefile/Makefile index 0b232e3e9b..b1e214ff67 100644 --- a/usr/src/test/zfs-tests/tests/functional/cachefile/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cachefile/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cachefile +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cachefile -PROGS = cachefile_001_pos \ - cachefile_002_pos \ - cachefile_003_pos \ - cachefile_004_pos - -FILES = cachefile.cfg \ - cachefile.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile b/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile index de9a016bcb..649aadc565 100644 --- a/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/casenorm/Makefile @@ -11,51 +11,13 @@ # # Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# Copyright (c) 2016 by Delphix. All rights reserved. # -include $(SRC)/Makefile.master -ROOTOPTPKG= $(ROOT)/opt/zfs-tests -ROOTTESTDIR= $(ROOTOPTPKG)/tests/functional/casenorm +include $(SRC)/Makefile.master -TESTS= setup \ - cleanup \ - case_all_values \ - norm_all_values \ - sensitive_none_lookup \ - sensitive_none_delete \ - sensitive_formd_lookup \ - sensitive_formd_delete \ - insensitive_none_lookup \ - insensitive_none_delete \ - insensitive_formd_lookup \ - insensitive_formd_delete \ - mixed_none_lookup \ - mixed_none_lookup_ci \ - mixed_none_delete \ - mixed_formd_lookup \ - mixed_formd_lookup_ci \ - mixed_formd_delete +ROOTOPTPKG = $(ROOT)/opt/zfs-tests +TARGETDIR = $(ROOTOPTPKG)/tests/functional/casenorm -FILES= casenorm.cfg \ - casenorm.kshlib - -ROOTTESTS= $(TESTS:%=$(ROOTTESTDIR)/%) -ROOTFILES= $(FILES:%=$(ROOTTESTDIR)/%) -$(ROOTTESTS) := FILEMODE = 0555 -$(ROOTFILES) := FILEMODE = 0444 - -all lint clean clobber: - -install: $(ROOTTESTS) $(ROOTFILES) - -$(ROOTTESTS) $(ROOTFILES): $(ROOTTESTDIR) - -$(ROOTTESTDIR): - $(INS.dir) - -$(ROOTTESTDIR)/%: %.ksh - $(INS.rename) - -$(ROOTTESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile index 8182cab0b9..29081d6f40 100644 --- a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile @@ -10,40 +10,13 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/checksum - -SCRIPTS = run_edonr_test \ - run_sha2_test \ - run_skein_test - -CMDS = $(SCRIPTS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -SUBDIRS = edonr \ - sha2 \ - skein +TARGETDIR = $(ROOTOPTPKG)/tests/functional/checksum +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs index b8dacd5b54..45b39ef904 100644 --- a/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs +++ b/usr/src/test/zfs-tests/tests/functional/checksum/Makefile.subdirs @@ -10,7 +10,7 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # include $(SRC)/cmd/Makefile.cmd diff --git a/usr/src/test/zfs-tests/tests/functional/clean_mirror/Makefile b/usr/src/test/zfs-tests/tests/functional/clean_mirror/Makefile index 93ef8bbe4f..2ddd9b7aba 100644 --- a/usr/src/test/zfs-tests/tests/functional/clean_mirror/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/clean_mirror/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/clean_mirror +TARGETDIR = $(ROOTOPTPKG)/tests/functional/clean_mirror -PROGS = clean_mirror_001_pos \ - clean_mirror_002_pos \ - clean_mirror_003_pos \ - clean_mirror_004_pos \ - cleanup \ - setup - -FILES = clean_mirror_common.kshlib \ - default.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/Makefile index 26bbb478ae..af96143405 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/Makefile @@ -10,74 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root - -PROGS = cli_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -SUBDIRS = zdb \ - zfs \ - zfs_clone \ - zfs_copies \ - zfs_create \ - zfs_destroy \ - zfs_get \ - zfs_inherit \ - zfs_mount \ - zfs_promote \ - zfs_property \ - zfs_receive \ - zfs_rename \ - zfs_reservation \ - zfs_rollback \ - zfs_send \ - zfs_set \ - zfs_share \ - zfs_snapshot \ - zfs_unmount \ - zfs_unshare \ - zfs_upgrade \ - zpool \ - zpool_add \ - zpool_attach \ - zpool_clear \ - zpool_create \ - zpool_destroy \ - zpool_detach \ - zpool_expand \ - zpool_export \ - zpool_get \ - zpool_history \ - zpool_import \ - zpool_offline \ - zpool_online \ - zpool_remove \ - zpool_replace \ - zpool_scrub \ - zpool_set \ - zpool_status \ - zpool_upgrade +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/Makefile index f60ca24f1e..cde1e1636a 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/Makefile @@ -10,31 +10,12 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zdb +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zdb -PROGS = zdb_001_neg \ - zdb_002_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/Makefile index 01f933aafc..c3095b5ae1 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs -PROGS = cleanup \ - setup \ - zfs_001_neg \ - zfs_002_pos \ - zfs_003_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile index 1d407e01f5..ca362453fc 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_clone +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_clone -PROGS = cleanup \ - setup \ - zfs_clone_001_neg \ - zfs_clone_002_pos \ - zfs_clone_003_pos \ - zfs_clone_004_pos \ - zfs_clone_005_pos \ - zfs_clone_006_pos \ - zfs_clone_007_pos \ - zfs_clone_008_neg \ - zfs_clone_009_neg \ - zfs_clone_010_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile index ccbbd2b3cd..f8db6e4e52 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_copies +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_copies -PROGS = cleanup \ - setup \ - zfs_copies_001_pos \ - zfs_copies_002_pos \ - zfs_copies_003_pos \ - zfs_copies_004_neg \ - zfs_copies_005_neg \ - zfs_copies_006_pos - -FILES = zfs_copies.cfg \ - zfs_copies.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/Makefile index 29a905e036..9e81ce0c7d 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/Makefile @@ -10,48 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_create +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_create -PROGS = cleanup \ - setup \ - zfs_create_001_pos \ - zfs_create_002_pos \ - zfs_create_003_pos \ - zfs_create_004_pos \ - zfs_create_005_pos \ - zfs_create_006_pos \ - zfs_create_007_pos \ - zfs_create_008_neg \ - zfs_create_009_neg \ - zfs_create_010_neg \ - zfs_create_011_pos \ - zfs_create_012_pos \ - zfs_create_013_pos - -FILES = properties.kshlib \ - zfs_create_common.kshlib \ - zfs_create.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile index f1e60b5451..3bbffd5848 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile @@ -10,50 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_destroy +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_destroy -PROGS = cleanup \ - setup \ - zfs_destroy_001_pos \ - zfs_destroy_002_pos \ - zfs_destroy_003_pos \ - zfs_destroy_004_pos \ - zfs_destroy_005_neg \ - zfs_destroy_006_neg \ - zfs_destroy_007_neg \ - zfs_destroy_008_pos \ - zfs_destroy_009_pos \ - zfs_destroy_010_pos \ - zfs_destroy_011_pos \ - zfs_destroy_012_pos \ - zfs_destroy_013_neg \ - zfs_destroy_014_pos \ - zfs_destroy_015_pos \ - zfs_destroy_016_pos - -FILES = zfs_destroy_common.kshlib \ - zfs_destroy.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/Makefile index b2078fdcc6..d5c794d7d9 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/Makefile @@ -10,44 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_get +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_get -PROGS = cleanup \ - setup \ - zfs_get_001_pos \ - zfs_get_002_pos \ - zfs_get_003_pos \ - zfs_get_004_pos \ - zfs_get_005_neg \ - zfs_get_006_neg \ - zfs_get_007_neg \ - zfs_get_008_pos \ - zfs_get_009_pos \ - zfs_get_010_neg - -FILES = zfs_get_common.kshlib \ - zfs_get_list_d.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile index 8f5538195e..7a92a63351 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile @@ -10,31 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_inherit +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_inherit -PROGS = cleanup \ - setup \ - zfs_inherit_001_neg \ - zfs_inherit_002_neg \ - zfs_inherit_003_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile index 4266b316a9..08417ad86b 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile @@ -10,47 +10,12 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_mount +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_mount -PROGS = cleanup \ - setup \ - zfs_mount_001_pos \ - zfs_mount_002_pos \ - zfs_mount_003_pos \ - zfs_mount_004_pos \ - zfs_mount_005_pos \ - zfs_mount_006_pos \ - zfs_mount_007_pos \ - zfs_mount_008_pos \ - zfs_mount_009_neg \ - zfs_mount_010_neg \ - zfs_mount_011_neg \ - zfs_mount_012_neg \ - zfs_mount_all_001_pos - -FILES = zfs_mount.cfg \ - zfs_mount.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile index a535b40788..463823d092 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile @@ -10,41 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_promote +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_promote -PROGS = cleanup \ - setup \ - zfs_promote_001_pos \ - zfs_promote_002_pos \ - zfs_promote_003_pos \ - zfs_promote_004_pos \ - zfs_promote_005_pos \ - zfs_promote_006_neg \ - zfs_promote_007_neg \ - zfs_promote_008_pos - -FILES = zfs_promote.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/Makefile index 488cb7399d..0d1080e9e6 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_property +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_property -PROGS = cleanup \ - setup \ - zfs_written_property_001_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile index 516c0eb77d..d1316b2cfe 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile @@ -10,45 +10,13 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_receive +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_receive -PROGS = cleanup \ - setup \ - zfs_receive_001_pos \ - zfs_receive_002_pos \ - zfs_receive_003_pos \ - zfs_receive_004_neg \ - zfs_receive_005_neg \ - zfs_receive_006_pos \ - zfs_receive_007_neg \ - zfs_receive_008_pos \ - zfs_receive_009_neg \ - zfs_receive_010_pos \ - zfs_receive_011_pos \ - zfs_receive_012_pos \ - zfs_receive_013_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile index ec2540ebbd..a79831a21a 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile @@ -10,47 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_rename +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_rename -PROGS = cleanup \ - setup \ - zfs_rename_001_pos \ - zfs_rename_002_pos \ - zfs_rename_003_pos \ - zfs_rename_004_neg \ - zfs_rename_005_neg \ - zfs_rename_006_pos \ - zfs_rename_007_pos \ - zfs_rename_008_pos \ - zfs_rename_009_neg \ - zfs_rename_010_neg \ - zfs_rename_011_pos \ - zfs_rename_012_neg \ - zfs_rename_013_pos - -FILES = zfs_rename.cfg \ - zfs_rename.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile index 133323f53a..19e37209ab 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_reservation +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_reservation -PROGS = cleanup \ - setup \ - zfs_reservation_001_pos \ - zfs_reservation_002_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile index 6e318133af..1f348df4a0 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_rollback +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_rollback -PROGS = cleanup \ - setup \ - zfs_rollback_001_pos \ - zfs_rollback_002_pos \ - zfs_rollback_003_neg \ - zfs_rollback_004_neg - -FILES = zfs_rollback.cfg \ - zfs_rollback_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/Makefile index 2647f8bbe4..07e5f78a5e 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_send +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_send -PROGS = cleanup \ - setup \ - zfs_send_001_pos \ - zfs_send_002_pos \ - zfs_send_003_pos \ - zfs_send_004_neg \ - zfs_send_005_pos \ - zfs_send_006_pos \ - zfs_send_007_pos - -FILES = zfs_send.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/Makefile index 2226e20d61..4c525b4709 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/Makefile @@ -10,59 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_set +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_set -PROGS = cleanup \ - setup \ - cache_001_pos \ - cache_002_neg \ - canmount_001_pos \ - canmount_002_pos \ - canmount_003_pos \ - canmount_004_pos \ - checksum_001_pos \ - compression_001_pos \ - mountpoint_001_pos \ - mountpoint_002_pos \ - mountpoint_003_pos \ - onoffs_001_pos \ - property_alias_001_pos \ - readonly_001_pos \ - reservation_001_neg \ - ro_props_001_pos \ - share_mount_001_neg \ - snapdir_001_pos \ - user_property_001_pos \ - user_property_002_pos \ - user_property_003_neg \ - user_property_004_pos \ - version_001_neg \ - zfs_set_001_neg \ - zfs_set_002_neg \ - zfs_set_003_neg - -FILES = zfs_set_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/Makefile index 7a0d515c11..5cd7953972 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/Makefile @@ -10,44 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_share +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_share -PROGS = cleanup \ - setup \ - zfs_share_001_pos \ - zfs_share_002_pos \ - zfs_share_003_pos \ - zfs_share_004_pos \ - zfs_share_005_pos \ - zfs_share_006_pos \ - zfs_share_007_neg \ - zfs_share_008_neg \ - zfs_share_009_neg \ - zfs_share_010_neg \ - zfs_share_011_pos - -FILES = zfs_share.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile index a605b26d6a..78fb435728 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile @@ -10,42 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_snapshot +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_snapshot -PROGS = cleanup \ - setup \ - zfs_snapshot_001_neg \ - zfs_snapshot_002_neg \ - zfs_snapshot_003_neg \ - zfs_snapshot_004_neg \ - zfs_snapshot_005_neg \ - zfs_snapshot_006_pos \ - zfs_snapshot_007_neg \ - zfs_snapshot_008_neg \ - zfs_snapshot_009_pos - -FILES = zfs_snapshot.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile index 6f5fe1f9ee..7ceec78dac 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile @@ -10,44 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_unmount +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_unmount -PROGS = cleanup \ - setup \ - zfs_unmount_001_pos \ - zfs_unmount_002_pos \ - zfs_unmount_003_pos \ - zfs_unmount_004_pos \ - zfs_unmount_005_pos \ - zfs_unmount_006_pos \ - zfs_unmount_007_neg \ - zfs_unmount_008_neg \ - zfs_unmount_009_pos \ - zfs_unmount_all_001_pos - -FILES = zfs_unmount.cfg \ - zfs_unmount.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile index a17c915078..e2b1b540af 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_unshare +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_unshare -PROGS = cleanup \ - setup \ - zfs_unshare_001_pos \ - zfs_unshare_002_pos \ - zfs_unshare_003_pos \ - zfs_unshare_004_neg \ - zfs_unshare_005_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile index 565b0b9ae4..b4cca44118 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_upgrade +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zfs_upgrade -PROGS = cleanup \ - setup \ - zfs_upgrade_001_pos \ - zfs_upgrade_002_pos \ - zfs_upgrade_003_pos \ - zfs_upgrade_004_pos \ - zfs_upgrade_005_pos \ - zfs_upgrade_006_neg \ - zfs_upgrade_007_neg - -FILES = zfs_upgrade.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/Makefile index e52cadaae9..1c862fc9bd 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool -PROGS = cleanup \ - setup \ - zpool_001_neg \ - zpool_002_pos \ - zpool_003_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/Makefile index 64e80bc285..05e3bc4a37 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/Makefile @@ -10,43 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_add +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_add -PROGS = cleanup \ - setup \ - zpool_add_001_pos \ - zpool_add_002_pos \ - zpool_add_003_pos \ - zpool_add_004_pos \ - zpool_add_005_pos \ - zpool_add_006_pos \ - zpool_add_007_neg \ - zpool_add_008_neg \ - zpool_add_009_neg - -FILES = zpool_add.cfg \ - zpool_add.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile index da4352afad..1ba05ed01c 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_attach +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_attach -PROGS = cleanup \ - setup \ - zpool_attach_001_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile index 180e4a5cb7..054937a889 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_clear +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_clear -PROGS = cleanup \ - setup \ - zpool_clear_001_pos \ - zpool_clear_002_neg \ - zpool_clear_003_neg - -FILES = zpool_clear.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/Makefile index 64edee3a1f..0188daad2f 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/Makefile @@ -10,60 +10,12 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_create +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_create -PROGS = cleanup \ - setup \ - zpool_create_001_pos \ - zpool_create_002_pos \ - zpool_create_003_pos \ - zpool_create_004_pos \ - zpool_create_005_pos \ - zpool_create_006_pos \ - zpool_create_007_neg \ - zpool_create_008_pos \ - zpool_create_009_neg \ - zpool_create_010_neg \ - zpool_create_011_neg \ - zpool_create_012_neg \ - zpool_create_014_neg \ - zpool_create_015_neg \ - zpool_create_016_pos \ - zpool_create_017_neg \ - zpool_create_018_pos \ - zpool_create_019_pos \ - zpool_create_020_pos \ - zpool_create_021_pos \ - zpool_create_022_pos \ - zpool_create_023_neg \ - zpool_create_features_001_pos \ - zpool_create_features_002_pos \ - zpool_create_features_003_pos \ - zpool_create_features_004_neg - -FILES = zpool_create.cfg \ - zpool_create.shlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile index f40ceafc93..a5e3175ece 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_destroy +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_destroy -PROGS = zpool_destroy_001_pos \ - zpool_destroy_002_pos \ - zpool_destroy_003_neg - -FILES = zpool_destroy.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile index e9c05c2d74..3b1c3a3495 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_detach +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_detach -PROGS = cleanup \ - setup \ - zpool_detach_001_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile index 72ef62ce25..447c9df0e0 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_expand +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_expand -PROGS = cleanup \ - setup \ - zpool_expand_001_pos \ - zpool_expand_002_pos \ - zpool_expand_003_neg - -FILES = zpool_expand.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/Makefile index 8b92ff939c..fa284775c6 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/Makefile @@ -10,35 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_export +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_export -PROGS = cleanup \ - setup \ - zpool_export_001_pos \ - zpool_export_002_pos \ - zpool_export_003_neg \ - zpool_export_004_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/Makefile index 52c68f4907..4f0396e87b 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/Makefile @@ -10,37 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_get +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_get -PROGS = cleanup \ - setup \ - zpool_get_001_pos \ - zpool_get_002_pos \ - zpool_get_003_pos \ - zpool_get_004_neg - -FILES = zpool_get.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/Makefile index 8248da43db..f49ce221e4 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_history +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_history -PROGS = cleanup \ - setup \ - zpool_history_001_neg \ - zpool_history_002_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/Makefile index afd7be9a5a..1998799442 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/Makefile @@ -10,58 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_import - -PROGS = cleanup \ - setup \ - zpool_import_001_pos \ - zpool_import_002_pos \ - zpool_import_003_pos \ - zpool_import_004_pos \ - zpool_import_005_pos \ - zpool_import_006_pos \ - zpool_import_007_pos \ - zpool_import_008_pos \ - zpool_import_009_neg \ - zpool_import_010_pos \ - zpool_import_011_neg \ - zpool_import_012_pos \ - zpool_import_013_neg \ - zpool_import_all_001_pos \ - zpool_import_features_001_pos \ - zpool_import_features_002_neg \ - zpool_import_features_003_pos \ - zpool_import_missing_001_pos \ - zpool_import_missing_002_pos \ - zpool_import_missing_003_pos \ - zpool_import_rename_001_pos - -FILES = zpool_import.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -SUBDIRS = blockfiles +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_import +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile index da96980c29..473599d83f 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile @@ -10,27 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -BLOCKFILESDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_import/blockfiles +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_import/blockfiles -FILES = unclean_export.dat.bz2 - -CMDS = $(FILES:%=$(BLOCKFILESDIR)/%) -$(CMDS) := FILEMODE = 0444 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(BLOCKFILESDIR) - -$(BLOCKFILESDIR): - $(INS.dir) - -$(BLOCKFILESDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile index bfe3b8b723..699cdcbcd4 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_offline +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_offline -PROGS = cleanup \ - setup \ - zpool_offline_001_pos \ - zpool_offline_002_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/Makefile index 92fa336b18..9fd9b3b8e2 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_online +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_online -PROGS = cleanup \ - setup \ - zpool_online_001_pos \ - zpool_online_002_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile index f84c999441..49bce7c140 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_remove +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_remove -PROGS = cleanup \ - setup \ - zpool_remove_001_neg \ - zpool_remove_002_pos \ - zpool_remove_003_pos - -FILES = zpool_remove.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile index 7abdefe9b7..7bb074dbf8 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_replace +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_replace -PROGS = cleanup \ - setup \ - zpool_replace_001_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile index 7ebeda68d0..337fb84a2c 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_scrub +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_scrub -PROGS = cleanup \ - setup \ - zpool_scrub_001_neg \ - zpool_scrub_002_pos \ - zpool_scrub_003_pos \ - zpool_scrub_004_pos \ - zpool_scrub_005_pos - -FILES = zpool_scrub.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/Makefile index 60e87622a3..3ee75f178a 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_set +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_set -PROGS = zpool_set_001_pos \ - zpool_set_002_neg \ - zpool_set_003_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/Makefile index 7af10289db..1917385c04 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_status +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_status -PROGS = cleanup \ - setup \ - zpool_status_001_pos \ - zpool_status_002_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile index 67c0329568..52199504fa 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile @@ -10,47 +10,13 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_upgrade - -PROGS = cleanup \ - setup \ - zpool_upgrade_001_pos \ - zpool_upgrade_002_pos \ - zpool_upgrade_003_pos \ - zpool_upgrade_004_pos \ - zpool_upgrade_005_neg \ - zpool_upgrade_006_neg \ - zpool_upgrade_007_pos \ - zpool_upgrade_008_pos \ - zpool_upgrade_009_neg - -FILES = zpool_upgrade.cfg \ - zpool_upgrade.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -SUBDIRS = blockfiles +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_upgrade +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile index bac8d4dd3f..eb1a68894a 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile @@ -10,78 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -BLOCKFILESDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_upgrade/blockfiles +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zpool_upgrade/blockfiles -FILES = zfs-broken-mirror1.dat.bz2 \ - zfs-broken-mirror2.dat.bz2 \ - zfs-pool-v1.dat.bz2 \ - zfs-pool-v10.dat.bz2 \ - zfs-pool-v11.dat.bz2 \ - zfs-pool-v12.dat.bz2 \ - zfs-pool-v13.dat.bz2 \ - zfs-pool-v14.dat.bz2 \ - zfs-pool-v15.dat.bz2 \ - zfs-pool-v1mirror1.dat.bz2 \ - zfs-pool-v1mirror2.dat.bz2 \ - zfs-pool-v1mirror3.dat.bz2 \ - zfs-pool-v1raidz1.dat.bz2 \ - zfs-pool-v1raidz2.dat.bz2 \ - zfs-pool-v1raidz3.dat.bz2 \ - zfs-pool-v1stripe1.dat.bz2 \ - zfs-pool-v1stripe2.dat.bz2 \ - zfs-pool-v1stripe3.dat.bz2 \ - zfs-pool-v2.dat.bz2 \ - zfs-pool-v2mirror1.dat.bz2 \ - zfs-pool-v2mirror2.dat.bz2 \ - zfs-pool-v2mirror3.dat.bz2 \ - zfs-pool-v2raidz1.dat.bz2 \ - zfs-pool-v2raidz2.dat.bz2 \ - zfs-pool-v2raidz3.dat.bz2 \ - zfs-pool-v2stripe1.dat.bz2 \ - zfs-pool-v2stripe2.dat.bz2 \ - zfs-pool-v2stripe3.dat.bz2 \ - zfs-pool-v3.dat.bz2 \ - zfs-pool-v3hotspare1.dat.bz2 \ - zfs-pool-v3hotspare2.dat.bz2 \ - zfs-pool-v3hotspare3.dat.bz2 \ - zfs-pool-v3mirror1.dat.bz2 \ - zfs-pool-v3mirror2.dat.bz2 \ - zfs-pool-v3mirror3.dat.bz2 \ - zfs-pool-v3raidz1.dat.bz2 \ - zfs-pool-v3raidz2.dat.bz2 \ - zfs-pool-v3raidz21.dat.bz2 \ - zfs-pool-v3raidz22.dat.bz2 \ - zfs-pool-v3raidz23.dat.bz2 \ - zfs-pool-v3raidz3.dat.bz2 \ - zfs-pool-v3stripe1.dat.bz2 \ - zfs-pool-v3stripe2.dat.bz2 \ - zfs-pool-v3stripe3.dat.bz2 \ - zfs-pool-v4.dat.bz2 \ - zfs-pool-v5.dat.bz2 \ - zfs-pool-v6.dat.bz2 \ - zfs-pool-v7.dat.bz2 \ - zfs-pool-v8.dat.bz2 \ - zfs-pool-v9.dat.bz2 \ - zfs-pool-v999.dat.bz2 \ - zfs-pool-vBROKEN.dat.bz2 - -CMDS = $(FILES:%=$(BLOCKFILESDIR)/%) -$(CMDS) := FILEMODE = 0444 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(BLOCKFILESDIR) - -$(BLOCKFILESDIR): - $(INS.dir) - -$(BLOCKFILESDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_user/Makefile index b1d21436ac..95f371db6e 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_user/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_user/Makefile @@ -10,36 +10,8 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - -include $(SRC)/Makefile.master - -ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_user - -PROGS = cli_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -SUBDIRS = misc \ - zfs_list \ - zpool_iostat \ - zpool_list - +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/Makefile index e2f5a44e91..9f7c9de0d4 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/Makefile @@ -10,74 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_user/misc +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_user/misc -PROGS = cleanup \ - setup \ - zdb_001_neg \ - zfs_001_neg \ - zfs_allow_001_neg \ - zfs_clone_001_neg \ - zfs_create_001_neg \ - zfs_destroy_001_neg \ - zfs_get_001_neg \ - zfs_inherit_001_neg \ - zfs_mount_001_neg \ - zfs_promote_001_neg \ - zfs_receive_001_neg \ - zfs_rename_001_neg \ - zfs_rollback_001_neg \ - zfs_send_001_neg \ - zfs_set_001_neg \ - zfs_share_001_neg \ - zfs_snapshot_001_neg \ - zfs_unallow_001_neg \ - zfs_unmount_001_neg \ - zfs_unshare_001_neg \ - zfs_upgrade_001_neg \ - zpool_001_neg \ - zpool_add_001_neg \ - zpool_attach_001_neg \ - zpool_clear_001_neg \ - zpool_create_001_neg \ - zpool_destroy_001_neg \ - zpool_detach_001_neg \ - zpool_export_001_neg \ - zpool_get_001_neg \ - zpool_history_001_neg \ - zpool_import_001_neg \ - zpool_import_002_neg \ - zpool_offline_001_neg \ - zpool_online_001_neg \ - zpool_remove_001_neg \ - zpool_replace_001_neg \ - zpool_scrub_001_neg \ - zpool_set_001_neg \ - zpool_status_001_neg \ - zpool_upgrade_001_neg - -FILES = misc.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/Makefile index e73ffe0372..f38dd9c721 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_user/zfs_list +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_user/zfs_list -PROGS = cleanup \ - setup \ - zfs_list_001_pos \ - zfs_list_002_pos \ - zfs_list_003_pos \ - zfs_list_004_neg \ - zfs_list_007_pos \ - zfs_list_008_neg - -FILES = zfs_list.cfg \ - zfs_list.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile index 4f4addd841..71d0df6378 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_user/zpool_iostat +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_user/zpool_iostat -PROGS = cleanup \ - setup \ - zpool_iostat_001_neg \ - zpool_iostat_002_pos \ - zpool_iostat_003_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/Makefile index df88210852..7c28d637e6 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_user/zpool_list +TARGETDIR = $(ROOTOPTPKG)/tests/functional/cli_user/zpool_list -PROGS = cleanup \ - setup \ - zpool_list_001_pos \ - zpool_list_002_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/compression/Makefile b/usr/src/test/zfs-tests/tests/functional/compression/Makefile index b04d4898f0..6c9028add3 100644 --- a/usr/src/test/zfs-tests/tests/functional/compression/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/compression/Makefile @@ -10,37 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/compression +TARGETDIR = $(ROOTOPTPKG)/tests/functional/compression -PROGS = cleanup \ - setup \ - compress_001_pos \ - compress_002_pos \ - compress_003_pos \ - compress_004_pos - -FILES = compress.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/Makefile b/usr/src/test/zfs-tests/tests/functional/delegate/Makefile index f8eb5b42e6..143d88a666 100644 --- a/usr/src/test/zfs-tests/tests/functional/delegate/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/delegate/Makefile @@ -10,54 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/delegate +TARGETDIR = $(ROOTOPTPKG)/tests/functional/delegate -PROGS = cleanup \ - setup \ - zfs_allow_001_pos \ - zfs_allow_002_pos \ - zfs_allow_003_pos \ - zfs_allow_004_pos \ - zfs_allow_005_pos \ - zfs_allow_006_pos \ - zfs_allow_007_pos \ - zfs_allow_008_pos \ - zfs_allow_009_neg \ - zfs_allow_010_pos \ - zfs_allow_011_neg \ - zfs_allow_012_neg \ - zfs_unallow_001_pos \ - zfs_unallow_002_pos \ - zfs_unallow_003_pos \ - zfs_unallow_004_pos \ - zfs_unallow_005_pos \ - zfs_unallow_006_pos \ - zfs_unallow_007_neg \ - zfs_unallow_008_neg - -FILES = delegate.cfg \ - delegate_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/devices/Makefile b/usr/src/test/zfs-tests/tests/functional/devices/Makefile index a35c2389ce..fc856f7554 100644 --- a/usr/src/test/zfs-tests/tests/functional/devices/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/devices/Makefile @@ -10,37 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/devices +TARGETDIR = $(ROOTOPTPKG)/tests/functional/devices -PROGS = cleanup \ - devices_001_pos \ - devices_002_neg \ - devices_003_pos \ - setup - -FILES = devices.cfg \ - devices_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/features/Makefile b/usr/src/test/zfs-tests/tests/functional/features/Makefile index 38b6138bf7..95f371db6e 100644 --- a/usr/src/test/zfs-tests/tests/functional/features/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/features/Makefile @@ -10,18 +10,8 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - -include $(SRC)/Makefile.master - -ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/features/async_destroy - -all install lint clean clobber: - -SUBDIRS = async_destroy - +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/features/async_destroy/Makefile b/usr/src/test/zfs-tests/tests/functional/features/async_destroy/Makefile index 996d316676..b451eb5dec 100644 --- a/usr/src/test/zfs-tests/tests/functional/features/async_destroy/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/features/async_destroy/Makefile @@ -10,29 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/features/async_destroy +TARGETDIR = $(ROOTOPTPKG)/tests/functional/features/async_destroy -PROGS = async_destroy_001_pos \ - cleanup \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/grow_pool/Makefile b/usr/src/test/zfs-tests/tests/functional/grow_pool/Makefile index b21c1eec0e..a61d5ed92e 100644 --- a/usr/src/test/zfs-tests/tests/functional/grow_pool/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/grow_pool/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/grow_pool +TARGETDIR = $(ROOTOPTPKG)/tests/functional/grow_pool -PROGS = cleanup \ - grow_pool_001_pos \ - setup - -FILES = grow_pool.cfg \ - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/grow_replicas/Makefile b/usr/src/test/zfs-tests/tests/functional/grow_replicas/Makefile index aeac0aa3f6..6df3dfced4 100644 --- a/usr/src/test/zfs-tests/tests/functional/grow_replicas/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/grow_replicas/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/grow_replicas +TARGETDIR = $(ROOTOPTPKG)/tests/functional/grow_replicas -PROGS = grow_replicas_001_pos - -FILES = grow_replicas.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/history/Makefile b/usr/src/test/zfs-tests/tests/functional/history/Makefile index 92e8b4c4a7..b010431549 100644 --- a/usr/src/test/zfs-tests/tests/functional/history/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/history/Makefile @@ -10,55 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/history +TARGETDIR = $(ROOTOPTPKG)/tests/functional/history -PROGS = cleanup \ - history_001_pos \ - history_002_pos \ - history_003_pos \ - history_004_pos \ - history_005_neg \ - history_006_neg \ - history_007_pos \ - history_008_pos \ - history_009_pos \ - history_010_pos \ - setup - -FILES = history.cfg \ - history_common.kshlib - -DATAFILES = i386.migratedpool.DAT.Z \ - i386.orig_history.txt \ - sparc.migratedpool.DAT.Z \ - sparc.orig_history.txt \ - zfs-pool-v4.dat.Z - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -DATA = $(DATAFILES:%=$(TESTDIR)/%) -$(DATA) := FILEMODE = 0444 - -all lint clean clobber: - -install: $(CMDS) $(DATA) - -$(CMDS): $(TESTDIR) - -$(DATA): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/holes/Makefile b/usr/src/test/zfs-tests/tests/functional/holes/Makefile index 2ee3940779..95c16dea87 100644 --- a/usr/src/test/zfs-tests/tests/functional/holes/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/holes/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2014 by Delphix. All rights reserved. +# Copyright (c) 2014, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/holes +TARGETDIR = $(ROOTOPTPKG)/tests/functional/holes -PROGS = cleanup \ - holes_sanity \ - setup - -FILES = holes.shlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/inheritance/Makefile b/usr/src/test/zfs-tests/tests/functional/inheritance/Makefile index 115c33b5ae..dba5b0cac7 100644 --- a/usr/src/test/zfs-tests/tests/functional/inheritance/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/inheritance/Makefile @@ -10,81 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/inheritance +TARGETDIR = $(ROOTOPTPKG)/tests/functional/inheritance -PROGS = cleanup \ - inherit_001_pos - -FILES = config001.cfg \ - config002.cfg \ - config003.cfg \ - config004.cfg \ - config005.cfg \ - config006.cfg \ - config007.cfg \ - config008.cfg \ - config009.cfg \ - config010.cfg \ - config011.cfg \ - config012.cfg \ - config013.cfg \ - config014.cfg \ - config015.cfg \ - config016.cfg \ - config017.cfg \ - config018.cfg \ - config019.cfg \ - config020.cfg \ - config021.cfg \ - config022.cfg \ - config023.cfg \ - config024.cfg \ - inherit.kshlib \ - state001.cfg \ - state002.cfg \ - state003.cfg \ - state004.cfg \ - state005.cfg \ - state006.cfg \ - state007.cfg \ - state008.cfg \ - state009.cfg \ - state010.cfg \ - state011.cfg \ - state012.cfg \ - state013.cfg \ - state014.cfg \ - state015.cfg \ - state016.cfg \ - state017.cfg \ - state018.cfg \ - state019.cfg \ - state020.cfg \ - state021.cfg \ - state022.cfg \ - state023.cfg \ - state024.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/Makefile b/usr/src/test/zfs-tests/tests/functional/inuse/Makefile index ebdaaf37bc..ca43468e1c 100644 --- a/usr/src/test/zfs-tests/tests/functional/inuse/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/inuse/Makefile @@ -10,41 +10,12 @@ # # -# Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/inuse +TARGETDIR = $(ROOTOPTPKG)/tests/functional/inuse -PROGS = cleanup \ - inuse_001_pos \ - inuse_003_pos \ - inuse_004_pos \ - inuse_005_pos \ - inuse_006_pos \ - inuse_007_pos \ - inuse_008_pos \ - inuse_009_pos \ - setup - -FILES = inuse.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/large_files/Makefile b/usr/src/test/zfs-tests/tests/functional/large_files/Makefile index 8ea1c29831..46b947d594 100644 --- a/usr/src/test/zfs-tests/tests/functional/large_files/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/large_files/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/large_files +TARGETDIR = $(ROOTOPTPKG)/tests/functional/large_files -PROGS = cleanup \ - large_files_001_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/largest_pool/Makefile b/usr/src/test/zfs-tests/tests/functional/largest_pool/Makefile index 1ce503fc1f..76d7f9e974 100644 --- a/usr/src/test/zfs-tests/tests/functional/largest_pool/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/largest_pool/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/largest_pool +TARGETDIR = $(ROOTOPTPKG)/tests/functional/largest_pool -PROGS = largest_pool_001_pos - -FILES = largest_pool.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/link_count/Makefile b/usr/src/test/zfs-tests/tests/functional/link_count/Makefile index 57d1b058f9..acd0e2d7bc 100644 --- a/usr/src/test/zfs-tests/tests/functional/link_count/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/link_count/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/link_count +TARGETDIR = $(ROOTOPTPKG)/tests/functional/link_count -PROGS = cleanup \ - link_count_001 \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/mdb/Makefile b/usr/src/test/zfs-tests/tests/functional/mdb/Makefile index 21bd192153..a4103a890b 100644 --- a/usr/src/test/zfs-tests/tests/functional/mdb/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/mdb/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/mdb +TARGETDIR = $(ROOTOPTPKG)/tests/functional/mdb -PROGS = cleanup \ - mdb_001_pos \ - setup - - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/migration/Makefile b/usr/src/test/zfs-tests/tests/functional/migration/Makefile index 336db3d83e..3aed193267 100644 --- a/usr/src/test/zfs-tests/tests/functional/migration/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/migration/Makefile @@ -10,46 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/migration +TARGETDIR = $(ROOTOPTPKG)/tests/functional/migration -PROGS = cleanup \ - migration_001_pos \ - migration_002_pos \ - migration_003_pos \ - migration_004_pos \ - migration_005_pos \ - migration_006_pos \ - migration_007_pos \ - migration_008_pos \ - migration_009_pos \ - migration_010_pos \ - migration_011_pos \ - migration_012_pos \ - setup - -FILES = migration.cfg \ - migration.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/mmap/Makefile b/usr/src/test/zfs-tests/tests/functional/mmap/Makefile index 56fb19ec82..87a1e9ae29 100644 --- a/usr/src/test/zfs-tests/tests/functional/mmap/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/mmap/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/mmap +TARGETDIR = $(ROOTOPTPKG)/tests/functional/mmap -PROGS = cleanup \ - mmap_read_001_pos \ - mmap_write_001_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/mount/Makefile b/usr/src/test/zfs-tests/tests/functional/mount/Makefile index b86d1198dc..d9ad104aa6 100644 --- a/usr/src/test/zfs-tests/tests/functional/mount/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/mount/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/mount +TARGETDIR = $(ROOTOPTPKG)/tests/functional/mount -PROGS = cleanup \ - umount_001 \ - umountall_001 \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/mv_files/Makefile b/usr/src/test/zfs-tests/tests/functional/mv_files/Makefile index 70253f66ee..1ed21663c8 100644 --- a/usr/src/test/zfs-tests/tests/functional/mv_files/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/mv_files/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/mv_files +TARGETDIR = $(ROOTOPTPKG)/tests/functional/mv_files -PROGS = cleanup \ - mv_files_001_pos \ - mv_files_002_pos \ - setup - -FILES = mv_files.cfg \ - mv_files_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/nestedfs/Makefile b/usr/src/test/zfs-tests/tests/functional/nestedfs/Makefile index e308834ec6..1dc2e5a459 100644 --- a/usr/src/test/zfs-tests/tests/functional/nestedfs/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/nestedfs/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/nestedfs +TARGETDIR = $(ROOTOPTPKG)/tests/functional/nestedfs -PROGS = cleanup \ - nestedfs_001_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/no_space/Makefile b/usr/src/test/zfs-tests/tests/functional/no_space/Makefile index 4340e24bcf..574212a1aa 100644 --- a/usr/src/test/zfs-tests/tests/functional/no_space/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/no_space/Makefile @@ -10,35 +10,12 @@ # # -# Copyright (c) 2013, 2014 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/no_space +TARGETDIR = $(ROOTOPTPKG)/tests/functional/no_space -PROGS = cleanup \ - enospc_001_pos \ - enospc_002_pos \ - setup - -FILES = enospc.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/Makefile b/usr/src/test/zfs-tests/tests/functional/nopwrite/Makefile index 7d42a1fde1..b7ec29968a 100644 --- a/usr/src/test/zfs-tests/tests/functional/nopwrite/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/nopwrite +TARGETDIR = $(ROOTOPTPKG)/tests/functional/nopwrite -PROGS = cleanup \ - nopwrite.shlib \ - nopwrite_copies \ - nopwrite_mtime \ - nopwrite_negative \ - nopwrite_promoted_clone \ - nopwrite_recsize \ - nopwrite_sync \ - nopwrite_varying_compression \ - nopwrite_volume \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%.shlib: %.shlib - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/online_offline/Makefile b/usr/src/test/zfs-tests/tests/functional/online_offline/Makefile index 98135a4a31..00f7b433c7 100644 --- a/usr/src/test/zfs-tests/tests/functional/online_offline/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/online_offline/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2013, 2014 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/online_offline +TARGETDIR = $(ROOTOPTPKG)/tests/functional/online_offline -PROGS = cleanup \ - online_offline_001_pos \ - online_offline_002_neg \ - online_offline_003_neg \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/pool_names/Makefile b/usr/src/test/zfs-tests/tests/functional/pool_names/Makefile index 07c1192d49..61a3da655d 100644 --- a/usr/src/test/zfs-tests/tests/functional/pool_names/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/pool_names/Makefile @@ -10,31 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/pool_names +TARGETDIR = $(ROOTOPTPKG)/tests/functional/pool_names -PROGS = pool_names_001_pos \ - pool_names_002_neg - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/poolversion/Makefile b/usr/src/test/zfs-tests/tests/functional/poolversion/Makefile index bae573a103..93cb6a865f 100644 --- a/usr/src/test/zfs-tests/tests/functional/poolversion/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/poolversion/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/poolversion +TARGETDIR = $(ROOTOPTPKG)/tests/functional/poolversion -PROGS = cleanup \ - poolversion_001_pos \ - poolversion_002_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/privilege/Makefile b/usr/src/test/zfs-tests/tests/functional/privilege/Makefile index 4d0230db61..7fccbe45f0 100644 --- a/usr/src/test/zfs-tests/tests/functional/privilege/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/privilege/Makefile @@ -10,33 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/privilege +TARGETDIR = $(ROOTOPTPKG)/tests/functional/privilege -PROGS = cleanup \ - privilege_001_pos \ - privilege_002_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/quota/Makefile b/usr/src/test/zfs-tests/tests/functional/quota/Makefile index f1408a80bf..17233a366d 100644 --- a/usr/src/test/zfs-tests/tests/functional/quota/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/quota/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/quota +TARGETDIR = $(ROOTOPTPKG)/tests/functional/quota -PROGS = cleanup \ - quota_001_pos \ - quota_002_pos \ - quota_003_pos \ - quota_004_pos \ - quota_005_pos \ - quota_006_neg \ - setup - -FILES = quota.cfg \ - quota.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/redundancy/Makefile b/usr/src/test/zfs-tests/tests/functional/redundancy/Makefile index 2d953c9460..850c38df34 100644 --- a/usr/src/test/zfs-tests/tests/functional/redundancy/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/redundancy/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/redundancy +TARGETDIR = $(ROOTOPTPKG)/tests/functional/redundancy -PROGS = cleanup \ - redundancy_001_pos \ - redundancy_002_pos \ - redundancy_003_pos \ - redundancy_004_neg \ - setup - -FILES = redundancy.cfg \ - redundancy.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/Makefile b/usr/src/test/zfs-tests/tests/functional/refquota/Makefile index 8419ad3b85..523fb81f8e 100644 --- a/usr/src/test/zfs-tests/tests/functional/refquota/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/refquota/Makefile @@ -10,37 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/refquota +TARGETDIR = $(ROOTOPTPKG)/tests/functional/refquota -PROGS = cleanup \ - refquota_001_pos \ - refquota_002_pos \ - refquota_003_pos \ - refquota_004_pos \ - refquota_005_pos \ - refquota_006_neg \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/refreserv/Makefile b/usr/src/test/zfs-tests/tests/functional/refreserv/Makefile index 4a618feff7..ba5e14f9b3 100644 --- a/usr/src/test/zfs-tests/tests/functional/refreserv/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/refreserv/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/refreserv +TARGETDIR = $(ROOTOPTPKG)/tests/functional/refreserv -PROGS = cleanup \ - refreserv_001_pos \ - refreserv_002_pos \ - refreserv_003_pos \ - refreserv_004_pos \ - refreserv_005_pos \ - setup - -FILES = refreserv.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/rename_dirs/Makefile b/usr/src/test/zfs-tests/tests/functional/rename_dirs/Makefile index 4be0143080..f2c72869ff 100644 --- a/usr/src/test/zfs-tests/tests/functional/rename_dirs/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/rename_dirs/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/rename_dirs +TARGETDIR = $(ROOTOPTPKG)/tests/functional/rename_dirs -PROGS = cleanup \ - rename_dirs_001_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/replacement/Makefile b/usr/src/test/zfs-tests/tests/functional/replacement/Makefile index 964c0eb3c4..11e4ce2157 100644 --- a/usr/src/test/zfs-tests/tests/functional/replacement/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/replacement/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/replacement +TARGETDIR = $(ROOTOPTPKG)/tests/functional/replacement -PROGS = cleanup \ - replacement_001_pos \ - replacement_002_pos \ - replacement_003_pos \ - setup - -FILES = replacement.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/Makefile b/usr/src/test/zfs-tests/tests/functional/reservation/Makefile index 6a0d949f93..8a69a93276 100644 --- a/usr/src/test/zfs-tests/tests/functional/reservation/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/reservation/Makefile @@ -10,55 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/reservation +TARGETDIR = $(ROOTOPTPKG)/tests/functional/reservation -PROGS = cleanup \ - reservation_001_pos \ - reservation_002_pos \ - reservation_003_pos \ - reservation_004_pos \ - reservation_005_pos \ - reservation_006_pos \ - reservation_007_pos \ - reservation_008_pos \ - reservation_009_pos \ - reservation_010_pos \ - reservation_011_pos \ - reservation_012_pos \ - reservation_013_pos \ - reservation_014_pos \ - reservation_015_pos \ - reservation_016_pos \ - reservation_017_pos \ - reservation_018_pos \ - setup - -FILES = reservation.cfg \ - reservation.shlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.sh - $(INS.rename) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/rootpool/Makefile b/usr/src/test/zfs-tests/tests/functional/rootpool/Makefile index e0fdc2b686..31503bfdf6 100644 --- a/usr/src/test/zfs-tests/tests/functional/rootpool/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/rootpool/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/rootpool +TARGETDIR = $(ROOTOPTPKG)/tests/functional/rootpool -PROGS = cleanup \ - rootpool_002_neg \ - rootpool_003_neg \ - rootpool_007_pos \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/Makefile b/usr/src/test/zfs-tests/tests/functional/rsend/Makefile index 918cfcc56e..838f7f767f 100644 --- a/usr/src/test/zfs-tests/tests/functional/rsend/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/rsend/Makefile @@ -10,68 +10,12 @@ # # -# Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/rsend +TARGETDIR = $(ROOTOPTPKG)/tests/functional/rsend -PROGS = cleanup \ - rsend_001_pos \ - rsend_002_pos \ - rsend_003_pos \ - rsend_004_pos \ - rsend_005_pos \ - rsend_006_pos \ - rsend_007_pos \ - rsend_008_pos \ - rsend_009_pos \ - rsend_010_pos \ - rsend_011_pos \ - rsend_012_pos \ - rsend_013_pos \ - rsend_014_pos \ - rsend_019_pos \ - rsend_020_pos \ - rsend_021_pos \ - rsend_022_pos \ - rsend_024_pos \ - send-cD \ - send-c_embedded_blocks \ - send-c_incremental \ - send-c_lz4_disabled \ - send-c_mixed_compression \ - send-c_props \ - send-c_recv_dedup \ - send-c_recv_lz4_disabled \ - send-c_resume \ - send-c_stream_size_estimate \ - send-c_verify_contents \ - send-c_verify_ratio \ - send-c_volume \ - send-c_zstreamdump \ - send-cpL_varied_recsize \ - setup - -FILES = rsend.cfg \ - rsend.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/scrub_mirror/Makefile b/usr/src/test/zfs-tests/tests/functional/scrub_mirror/Makefile index 8833d90e91..6b173c90eb 100644 --- a/usr/src/test/zfs-tests/tests/functional/scrub_mirror/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/scrub_mirror/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/scrub_mirror +TARGETDIR = $(ROOTOPTPKG)/tests/functional/scrub_mirror -PROGS = cleanup \ - scrub_mirror_001_pos \ - scrub_mirror_002_pos \ - scrub_mirror_003_pos \ - scrub_mirror_004_pos \ - setup - -FILES = default.cfg \ - scrub_mirror_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/slog/Makefile b/usr/src/test/zfs-tests/tests/functional/slog/Makefile index fd551e23d8..1afbf9dd3b 100644 --- a/usr/src/test/zfs-tests/tests/functional/slog/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/slog/Makefile @@ -10,48 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/slog +TARGETDIR = $(ROOTOPTPKG)/tests/functional/slog -PROGS = cleanup \ - setup \ - slog_001_pos \ - slog_002_pos \ - slog_003_pos \ - slog_004_pos \ - slog_005_pos \ - slog_006_pos \ - slog_007_pos \ - slog_008_neg \ - slog_009_neg \ - slog_010_neg \ - slog_011_neg \ - slog_012_neg \ - slog_013_pos \ - slog_014_pos - -FILES = slog.cfg \ - slog.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/Makefile b/usr/src/test/zfs-tests/tests/functional/snapshot/Makefile index 73f1bceb07..3b12ec1176 100644 --- a/usr/src/test/zfs-tests/tests/functional/snapshot/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/snapshot/Makefile @@ -10,54 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/snapshot +TARGETDIR = $(ROOTOPTPKG)/tests/functional/snapshot -PROGS = cleanup \ - clone_001_pos \ - rollback_001_pos \ - rollback_002_pos \ - rollback_003_pos \ - setup \ - snapshot_001_pos \ - snapshot_002_pos \ - snapshot_003_pos \ - snapshot_004_pos \ - snapshot_005_pos \ - snapshot_006_pos \ - snapshot_007_pos \ - snapshot_008_pos \ - snapshot_009_pos \ - snapshot_010_pos \ - snapshot_011_pos \ - snapshot_012_pos \ - snapshot_013_pos \ - snapshot_014_pos \ - snapshot_015_pos \ - snapshot_016_pos \ - snapshot_017_pos - -FILES = snapshot.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/Makefile b/usr/src/test/zfs-tests/tests/functional/snapused/Makefile index 80202dc596..e82b890533 100644 --- a/usr/src/test/zfs-tests/tests/functional/snapused/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/snapused/Makefile @@ -10,38 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/snapused +TARGETDIR = $(ROOTOPTPKG)/tests/functional/snapused -PROGS = cleanup \ - setup \ - snapused_001_pos \ - snapused_002_pos \ - snapused_003_pos \ - snapused_004_pos \ - snapused_005_pos - -FILES = snapused.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/sparse/Makefile b/usr/src/test/zfs-tests/tests/functional/sparse/Makefile index 63b638bb5d..241f6bff14 100644 --- a/usr/src/test/zfs-tests/tests/functional/sparse/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/sparse/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/sparse +TARGETDIR = $(ROOTOPTPKG)/tests/functional/sparse -PROGS = cleanup \ - setup \ - sparse_001_pos - -FILES = sparse.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/truncate/Makefile b/usr/src/test/zfs-tests/tests/functional/truncate/Makefile index 7e6a4c8cc5..35dbaec4f9 100644 --- a/usr/src/test/zfs-tests/tests/functional/truncate/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/truncate/Makefile @@ -10,34 +10,12 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/truncate +TARGETDIR = $(ROOTOPTPKG)/tests/functional/truncate -PROGS = cleanup \ - setup \ - truncate.cfg \ - truncate_001_pos \ - truncate_002_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%.cfg: %.cfg - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/Makefile b/usr/src/test/zfs-tests/tests/functional/userquota/Makefile index 041275ab7f..c1d902dd36 100644 --- a/usr/src/test/zfs-tests/tests/functional/userquota/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/userquota/Makefile @@ -10,50 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/userquota +TARGETDIR = $(ROOTOPTPKG)/tests/functional/userquota -PROGS = cleanup \ - groupspace_001_pos \ - groupspace_002_pos \ - setup \ - userquota_001_pos \ - userquota_002_pos \ - userquota_003_pos \ - userquota_004_pos \ - userquota_005_neg \ - userquota_006_pos \ - userquota_007_pos \ - userquota_008_pos \ - userquota_009_pos \ - userquota_010_pos \ - userquota_011_pos \ - userquota_012_neg \ - userspace_001_pos \ - userspace_002_pos - -FILES = userquota.cfg \ - userquota_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/Makefile b/usr/src/test/zfs-tests/tests/functional/utils_test/Makefile index 64076def16..949a1782b0 100644 --- a/usr/src/test/zfs-tests/tests/functional/utils_test/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/utils_test/Makefile @@ -10,43 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/utils_test +TARGETDIR = $(ROOTOPTPKG)/tests/functional/utils_test -PROGS = cleanup \ - setup \ - utils_test_001_pos \ - utils_test_002_pos \ - utils_test_003_pos \ - utils_test_004_pos \ - utils_test_005_pos \ - utils_test_006_pos \ - utils_test_007_pos \ - utils_test_008_pos \ - utils_test_009_pos - -FILES = utils_test.cfg \ - utils_test.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/vdev_zaps/Makefile b/usr/src/test/zfs-tests/tests/functional/vdev_zaps/Makefile index 904ee33767..2c4e6b9c3f 100644 --- a/usr/src/test/zfs-tests/tests/functional/vdev_zaps/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/vdev_zaps/Makefile @@ -10,40 +10,12 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/vdev_zaps +TARGETDIR = $(ROOTOPTPKG)/tests/functional/vdev_zaps -PROGS = setup \ - vdev_zaps_001_pos \ - vdev_zaps_002_pos \ - vdev_zaps_003_pos \ - vdev_zaps_004_pos \ - vdev_zaps_005_pos \ - vdev_zaps_006_pos \ - vdev_zaps_007_pos \ - cleanup - -FILES = vdev_zaps.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/write_dirs/Makefile b/usr/src/test/zfs-tests/tests/functional/write_dirs/Makefile index 2238fd0247..6a45e8aaf6 100644 --- a/usr/src/test/zfs-tests/tests/functional/write_dirs/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/write_dirs/Makefile @@ -10,35 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/write_dirs +TARGETDIR = $(ROOTOPTPKG)/tests/functional/write_dirs -PROGS = cleanup \ - setup \ - write_dirs_001_pos \ - write_dirs_002_pos - -FILES = write_dirs.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/Makefile b/usr/src/test/zfs-tests/tests/functional/xattr/Makefile index cc273f3308..e0244a59c6 100644 --- a/usr/src/test/zfs-tests/tests/functional/xattr/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/xattr/Makefile @@ -10,46 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/xattr +TARGETDIR = $(ROOTOPTPKG)/tests/functional/xattr -PROGS = cleanup \ - setup \ - xattr_001_pos \ - xattr_002_neg \ - xattr_003_neg \ - xattr_004_pos \ - xattr_005_pos \ - xattr_006_pos \ - xattr_007_neg \ - xattr_008_pos \ - xattr_009_neg \ - xattr_010_neg \ - xattr_011_pos \ - xattr_012_pos \ - xattr_013_pos \ - -FILES = xattr_common.kshlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/Makefile b/usr/src/test/zfs-tests/tests/functional/zvol/Makefile index a9f20dda05..e3266fb29a 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/zvol/Makefile @@ -10,37 +10,13 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/zvol - -FILES = zvol.cfg \ - zvol_common.shlib - -CMDS = $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -SUBDIRS = zvol_ENOSPC \ - zvol_cli \ - zvol_misc \ - zvol_swap +TARGETDIR = $(ROOTOPTPKG)/tests/functional/zvol +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile index 4bfc33d4b3..1eef41e62f 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_ENOSPC +TARGETDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_ENOSPC -PROGS = cleanup \ - setup \ - zvol_ENOSPC_001_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/Makefile b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/Makefile index 0b80aecf34..4e7b4e8335 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/Makefile @@ -10,36 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_cli +TARGETDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_cli -PROGS = cleanup \ - setup \ - zvol_cli_001_pos \ - zvol_cli_002_pos \ - zvol_cli_003_neg - -FILES = zvol_cli.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/Makefile b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/Makefile index ff821217a7..74d909e54d 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/Makefile @@ -10,37 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_misc +TARGETDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_misc -PROGS = cleanup \ - setup \ - zvol_misc_001_neg \ - zvol_misc_002_pos \ - zvol_misc_003_neg \ - zvol_misc_004_pos \ - zvol_misc_005_neg \ - zvol_misc_006_pos - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/Makefile b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/Makefile index 7d463db092..1075434099 100644 --- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/Makefile @@ -10,39 +10,12 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_swap +TARGETDIR = $(ROOTOPTPKG)/tests/functional/zvol/zvol_swap -PROGS = cleanup \ - setup \ - zvol_swap_001_pos \ - zvol_swap_002_pos \ - zvol_swap_003_pos \ - zvol_swap_004_pos \ - zvol_swap_005_pos \ - zvol_swap_006_pos - -FILES = zvol_swap.cfg - -CMDS = $(PROGS:%=$(TESTDIR)/%) $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -$(TESTDIR)/%: %.ksh - $(INS.rename) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/perf/Makefile b/usr/src/test/zfs-tests/tests/perf/Makefile index 7886eabad6..8778df21bd 100644 --- a/usr/src/test/zfs-tests/tests/perf/Makefile +++ b/usr/src/test/zfs-tests/tests/perf/Makefile @@ -10,35 +10,13 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/perf - -PROGS = perf.shlib - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) - -SUBDIRS = fio \ - regression \ - scripts +TARGETDIR = $(ROOTOPTPKG)/tests/perf +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/perf/fio/Makefile b/usr/src/test/zfs-tests/tests/perf/fio/Makefile index 012e286de1..d5893fee88 100644 --- a/usr/src/test/zfs-tests/tests/perf/fio/Makefile +++ b/usr/src/test/zfs-tests/tests/perf/fio/Makefile @@ -10,32 +10,12 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/perf/fio +TARGETDIR = $(ROOTOPTPKG)/tests/perf/fio -FILES = mkfiles.fio \ - random_reads.fio \ - random_readwrite.fio \ - random_writes.fio \ - sequential_reads.fio \ - sequential_writes.fio - -CMDS = $(FILES:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0444 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/perf/regression/Makefile b/usr/src/test/zfs-tests/tests/perf/regression/Makefile index 1b4aa2befe..839743c650 100644 --- a/usr/src/test/zfs-tests/tests/perf/regression/Makefile +++ b/usr/src/test/zfs-tests/tests/perf/regression/Makefile @@ -10,37 +10,12 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/perf/regression +TARGETDIR = $(ROOTOPTPKG)/tests/perf/regression -PROGS = random_reads \ - random_readwrite \ - random_writes \ - sequential_reads \ - sequential_reads_cached \ - sequential_reads_cached_clone \ - sequential_writes \ - setup - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: %.ksh - $(INS.rename) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/perf/scripts/Makefile b/usr/src/test/zfs-tests/tests/perf/scripts/Makefile index aad3dd5943..9df0736802 100644 --- a/usr/src/test/zfs-tests/tests/perf/scripts/Makefile +++ b/usr/src/test/zfs-tests/tests/perf/scripts/Makefile @@ -10,28 +10,12 @@ # # -# Copyright (c) 2015 by Delphix. All rights reserved. +# Copyright (c) 2015, 2016 by Delphix. All rights reserved. # include $(SRC)/Makefile.master ROOTOPTPKG = $(ROOT)/opt/zfs-tests -TESTDIR = $(ROOTOPTPKG)/tests/perf/scripts +TARGETDIR = $(ROOTOPTPKG)/tests/perf/scripts -PROGS = io.d \ - prefetch_io.d - -CMDS = $(PROGS:%=$(TESTDIR)/%) -$(CMDS) := FILEMODE = 0555 - -all lint clean clobber: - -install: $(CMDS) - -$(CMDS): $(TESTDIR) - -$(TESTDIR): - $(INS.dir) - -$(TESTDIR)/%: % - $(INS.file) +include $(SRC)/test/zfs-tests/Makefile.com diff --git a/usr/src/test/zfs-tests/tests/stress/Makefile b/usr/src/test/zfs-tests/tests/stress/Makefile index 265d87942f..8b6356392f 100644 --- a/usr/src/test/zfs-tests/tests/stress/Makefile +++ b/usr/src/test/zfs-tests/tests/stress/Makefile @@ -10,11 +10,8 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # -.PARALLEL: $(SUBDIRS) - -SUBDIRS = - +include $(SRC)/test/zfs-tests/Makefile.com include $(SRC)/test/Makefile.com |