diff options
Diffstat (limited to 'usr/src/test/zfs-tests')
6 files changed, 286 insertions, 42 deletions
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh index f8a1851781..2026cac20a 100644 --- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh +++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh @@ -15,7 +15,7 @@ # Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2016 Nexenta Systems, Inc. -# Copyright 2018 Joyent, Inc. +# Copyright 2019 Joyent, Inc. # export PATH="/usr/bin" @@ -130,17 +130,17 @@ function constrain_path # Special case links ln -s /usr/gnu/bin/dd $PATHDIR/gnu_dd - # SmartOS does not ship sudo or truncate. Link to them in the - # package manager's namespace. - if [[ ! -x $PATHDIR/sudo ]]; then - rm $PATHDIR/sudo && ln -s /opt/local/bin/sudo $PATHDIR/sudo || - fail "Couldn't link sudo" - fi - if [[ ! -x $PATHDIR/truncate ]]; then - rm $PATHDIR/truncate && - ln -s /opt/local/bin/truncate $PATHDIR/truncate || - fail "Couldn't link truncate" - fi + # SmartOS does not ship some required packages by default. + # Link to them in the package manager's namespace. + pkgsrc_bin=/opt/local/bin + pkgsrc_packages="sudo truncate python base64" + for pkg in $pkgsrc_packages; do + if [[ ! -x $PATHDIR/$pkg ]]; then + rm $PATHDIR/$pkg && + ln -s $pkgsrc_bin/$pkg $PATHDIR/$pkg || + fail "Couldn't link $pkg" + fi + done } constrain_path diff --git a/usr/src/test/zfs-tests/runfiles/smartos.run b/usr/src/test/zfs-tests/runfiles/smartos.run index a594773ead..371da6a520 100644 --- a/usr/src/test/zfs-tests/runfiles/smartos.run +++ b/usr/src/test/zfs-tests/runfiles/smartos.run @@ -34,25 +34,248 @@ tags = ['functional', 'alloc_class'] [/opt/zfs-tests/tests/functional/cli_root/zpool_add] tests = ['zpool_add_010_pos'] +[/opt/zfs-tests/tests/functional/atime] +tests = ['atime_001_pos', 'atime_002_neg'] + +[/opt/zfs-tests/tests/functional/bootfs] +tests = ['bootfs_001_pos', 'bootfs_002_neg', 'bootfs_003_pos', + 'bootfs_004_neg', 'bootfs_005_neg', 'bootfs_006_pos', 'bootfs_007_pos', + 'bootfs_008_pos'] + +[/opt/zfs-tests/tests/functional/cache] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cachefile] +tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos', + 'cachefile_004_pos'] +pre = +post = + +[/opt/zfs-tests/tests/functional/channel_program/lua_core] +autotests = 1 + +[/opt/zfs-tests/tests/functional/channel_program/synctask_core] +autotests = 1 + +[/opt/zfs-tests/tests/functional/checksum] +tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test'] +pre = +post = + +[/opt/zfs-tests/tests/functional/clean_mirror] +tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos', + 'clean_mirror_003_pos', 'clean_mirror_004_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zdb] +tests = ['zdb_001_neg', 'zdb_002_pos'] +pre = +post = + +[/opt/zfs-tests/tests/functional/cli_root/zfs] +tests = ['zfs_001_neg', 'zfs_002_pos', 'zfs_003_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_clone] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_copies] +tests = ['zfs_copies_001_pos', 'zfs_copies_002_pos', 'zfs_copies_003_pos', + 'zfs_copies_004_neg', 'zfs_copies_005_neg', 'zfs_copies_006_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_create] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_destroy] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_get] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_inherit] +tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg', 'zfs_inherit_003_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_mount] +tests = ['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', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_program] +tests = ['zfs_program_json'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_promote] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_receive] +tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos', + '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', 'zfs_receive_014_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_remap] +tests = ['zfs_remap_cliargs', 'zfs_remap_obsolete_counts'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_rename] +tests = ['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', 'zfs_rename_014_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_reservation] +tests = ['zfs_reservation_001_pos', 'zfs_reservation_002_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_rollback] +tests = ['zfs_rollback_001_pos', 'zfs_rollback_002_pos', + 'zfs_rollback_003_neg', 'zfs_rollback_004_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_send] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_set] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_share] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_snapshot] +tests = ['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_009_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_unmount] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_unshare] +tests = ['zfs_unshare_001_pos', 'zfs_unshare_002_pos', 'zfs_unshare_003_pos', + 'zfs_unshare_004_neg', 'zfs_unshare_005_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zfs_upgrade] +tests = ['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'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool] +tests = ['zpool_001_neg', 'zpool_002_pos'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_add] +tests = ['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', + 'add_nested_replacing_spare'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_attach] +tests = ['zpool_attach_001_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_clear] +tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg', + 'zpool_clear_readonly'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_create] +tests = ['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', + 'zpool_create_tempname'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_destroy] +tests = ['zpool_destroy_001_pos', 'zpool_destroy_002_pos', + 'zpool_destroy_003_neg'] +pre = +post = + +[/opt/zfs-tests/tests/functional/cli_root/zpool_detach] +tests = ['zpool_detach_001_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_expand] +tests = ['zpool_expand_002_pos', 'zpool_expand_003_neg'] + +[/opt/zfs-tests/tests/functional/cli_root/zpool_export] +tests = ['zpool_export_001_pos', 'zpool_export_002_pos', + 'zpool_export_003_neg', 'zpool_export_004_pos'] + [/opt/zfs-tests/tests/functional/cli_root/zpool_get] tests = ['zpool_get_001_pos', 'zpool_get_002_pos', 'zpool_get_003_pos', 'zpool_get_004_neg'] +[/opt/zfs-tests/tests/functional/cli_root/zpool_history] +tests = ['zpool_history_001_neg', 'zpool_history_002_pos'] + [/opt/zfs-tests/tests/functional/cli_root/zpool_import] tests = ['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_missing_001_pos', + 'zpool_import_012_pos', 'zpool_import_013_neg', 'zpool_import_014_pos', + 'zpool_import_all_001_pos', 'zpool_import_missing_001_pos', 'zpool_import_missing_002_pos', 'zpool_import_missing_003_pos', - 'zpool_import_rename_001_pos'] + 'zpool_import_rename_001_pos', + 'import_cachefile_device_added', + 'import_cachefile_device_removed', + 'import_cachefile_mirror_attached', + 'import_cachefile_mirror_detached', + 'import_cachefile_device_replaced', + 'import_paths_changed'] [/opt/zfs-tests/tests/functional/cli_root/zpool_labelclear] tests = ['zpool_labelclear_active', 'zpool_labelclear_exported'] pre = post = +[/opt/zfs-tests/tests/functional/cli_root/zpool_initialize] +tests = ['zpool_initialize_attach_detach_add_remove', + 'zpool_initialize_import_export', + 'zpool_initialize_offline_export_import_online', + 'zpool_initialize_online_offline', + 'zpool_initialize_split', + 'zpool_initialize_start_and_cancel_neg', + 'zpool_initialize_start_and_cancel_pos', + 'zpool_initialize_suspend_resume', + 'zpool_initialize_unsupported_vdevs', + 'zpool_initialize_verify_checksums'] +pre = + [/opt/zfs-tests/tests/functional/cli_root/zpool_offline] tests = ['zpool_offline_001_pos', 'zpool_offline_002_neg'] @@ -60,7 +283,8 @@ tests = ['zpool_offline_001_pos', 'zpool_offline_002_neg'] tests = ['zpool_online_001_pos', 'zpool_online_002_neg'] [/opt/zfs-tests/tests/functional/cli_root/zpool_remove] -tests = ['zpool_remove_002_pos', 'zpool_remove_003_pos'] +tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos', + 'zpool_remove_003_pos'] [/opt/zfs-tests/tests/functional/cli_root/zpool_replace] tests = ['zpool_replace_001_neg', 'zpool_replace_002_neg'] @@ -69,9 +293,8 @@ tests = ['zpool_replace_001_neg', 'zpool_replace_002_neg'] tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart'] [/opt/zfs-tests/tests/functional/cli_root/zpool_scrub] -tests = ['zpool_scrub_001_neg', - 'zpool_scrub_004_pos', 'zpool_scrub_005_pos', 'zpool_scrub_print_repairing', - 'zpool_scrub_offline_device', 'zpool_scrub_multiple_copies'] +tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos', + 'zpool_scrub_004_pos', 'zpool_scrub_005_pos'] [/opt/zfs-tests/tests/functional/cli_root/zpool_set] tests = ['zpool_set_001_pos', 'zpool_set_002_neg', 'zpool_set_003_neg'] @@ -84,7 +307,7 @@ tests = ['zpool_status_001_pos', 'zpool_status_002_pos'] [/opt/zfs-tests/tests/functional/cli_root/zpool_upgrade] tests = ['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_008_pos', + 'zpool_upgrade_006_neg', 'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos', 'zpool_upgrade_009_neg'] [/opt/zfs-tests/tests/functional/cli_root/zpool_sync] @@ -141,9 +364,14 @@ tests = ['async_destroy_001_pos'] [/opt/zfs-tests/tests/functional/grow_pool] tests = ['grow_pool_001_pos'] +[/opt/zfs-tests/tests/functional/grow_replicas] +tests = ['grow_replicas_001_pos'] +pre = +post = + [/opt/zfs-tests/tests/functional/history] tests = ['history_001_pos', 'history_002_pos', 'history_003_pos', - 'history_004_pos', 'history_005_neg', 'history_006_neg', + 'history_004_pos', 'history_005_neg', 'history_006_neg', 'history_007_pos', 'history_008_pos'] [/opt/zfs-tests/tests/functional/holes] @@ -162,6 +390,11 @@ tests = ['large_dnode_001_pos', 'large_dnode_003_pos', [/opt/zfs-tests/tests/functional/large_files] tests = ['large_files_001_pos'] +[/opt/zfs-tests/tests/functional/largest_pool] +tests = ['largest_pool_001_pos'] +pre = +post = + [/opt/zfs-tests/tests/functional/link_count] tests = ['link_count_001'] @@ -193,7 +426,7 @@ tests = ['enospc_001_pos'] [/opt/zfs-tests/tests/functional/nopwrite] tests = ['nopwrite_copies', 'nopwrite_mtime', 'nopwrite_negative', - 'nopwrite_promoted_clone', 'nopwrite_recsize', + 'nopwrite_promoted_clone', 'nopwrite_recsize', 'nopwrite_sync', 'nopwrite_varying_compression', 'nopwrite_volume'] [/opt/zfs-tests/tests/functional/online_offline] @@ -205,10 +438,12 @@ tests = ['checkpoint_after_rewind', 'checkpoint_big_rewind', 'checkpoint_capacity', 'checkpoint_conf_change', 'checkpoint_discard', 'checkpoint_discard_busy', 'checkpoint_discard_many', 'checkpoint_indirect', 'checkpoint_invalid', 'checkpoint_lun_expsz', - 'checkpoint_open', 'checkpoint_removal', 'checkpoint_rewind' ] + 'checkpoint_open', 'checkpoint_removal', 'checkpoint_rewind', + 'checkpoint_ro_rewind', 'checkpoint_sm_scale', 'checkpoint_twice', + 'checkpoint_vdev_add', 'checkpoint_zdb'] [/opt/zfs-tests/tests/functional/pool_names] -tests = ['pool_names_002_neg'] +tests = ['pool_names_001_pos', 'pool_names_002_neg'] pre = post = @@ -238,9 +473,10 @@ tests = ['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_014_pos', 'reservation_015_pos', 'reservation_016_pos', - 'reservation_018_pos', 'reservation_019_pos', 'reservation_020_pos', - 'reservation_021_neg', 'reservation_022_pos'] + 'reservation_013_pos', 'reservation_014_pos', 'reservation_015_pos', + 'reservation_016_pos', 'reservation_017_pos', 'reservation_018_pos', + 'reservation_019_pos', 'reservation_020_pos', 'reservation_021_neg', + 'reservation_022_pos'] [/opt/zfs-tests/tests/functional/rootpool] tests = ['rootpool_003_neg'] @@ -252,10 +488,14 @@ tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos', 'rsend_019_pos', 'rsend_020_pos', 'rsend_021_pos', 'rsend_022_pos', 'rsend_024_pos', 'send-c_verify_ratio', 'send-c_verify_contents', - 'send-c_incremental', + 'send-c_incremental', 'send-cD', 'send-c_resume', 'send-c_recv_dedup'] +[/opt/zfs-tests/tests/functional/scrub_mirror] +tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos', + 'scrub_mirror_003_pos', 'scrub_mirror_004_pos'] + [/opt/zfs-tests/tests/functional/slog] tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos', 'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg', @@ -308,8 +548,11 @@ tests = ['zvol_dump_raidz'] pre = post = +[/opt/zfs-tests/tests/functional/zvol/zvol_misc] +tests = ['zvol_misc_001_neg', 'zvol_misc_002_pos', 'zvol_misc_003_neg', + 'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos'] + [/opt/zfs-tests/tests/functional/libzfs] tests = ['many_fds'] pre = post = - diff --git a/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class.cfg b/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class.cfg index 0a61f03cec..0bdae47f20 100644 --- a/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class.cfg +++ b/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class.cfg @@ -16,15 +16,15 @@ . $STF_SUITE/include/libtest.shlib -export ZPOOL_DISK0="/var/tmp/device-0" -export ZPOOL_DISK1="/var/tmp/device-1" -export ZPOOL_DISK2="/var/tmp/device-2" +export ZPOOL_DISK0="$TEST_BASE_DIR/device-0" +export ZPOOL_DISK1="$TEST_BASE_DIR/device-1" +export ZPOOL_DISK2="$TEST_BASE_DIR/device-2" export ZPOOL_DISKS="${ZPOOL_DISK0} ${ZPOOL_DISK1} ${ZPOOL_DISK2}" -export CLASS_DISK0="/var/tmp/device-3" -export CLASS_DISK1="/var/tmp/device-4" -export CLASS_DISK2="/var/tmp/device-5" -export CLASS_DISK3="/var/tmp/device-6" +export CLASS_DISK0="$TEST_BASE_DIR/device-3" +export CLASS_DISK1="$TEST_BASE_DIR/device-4" +export CLASS_DISK2="$TEST_BASE_DIR/device-5" +export CLASS_DISK3="$TEST_BASE_DIR/device-6" export CLASS_DISKS="${CLASS_DISK0} ${CLASS_DISK1} ${CLASS_DISK2} ${CLASS_DISK3}" export ZPOOL_DEVSIZE=1G diff --git a/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class_009_pos.ksh index e06b418e2a..fb47c78c7a 100755 --- a/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class_009_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/alloc_class/alloc_class_009_pos.ksh @@ -57,7 +57,7 @@ do log_must zpool create $TESTPOOL $type $ZPOOL_DISKS \ special $stype $sdisks log_must zpool export $TESTPOOL - log_must zpool import -d /var/tmp $imp_opt $TESTPOOL + log_must zpool import -d $TEST_BASE_DIR $imp_opt $TESTPOOL log_must display_status $TESTPOOL log_must zpool destroy -f $TESTPOOL done diff --git a/usr/src/test/zfs-tests/tests/functional/mmp/mmp.cfg b/usr/src/test/zfs-tests/tests/functional/mmp/mmp.cfg index 4fd94641f1..c3dfccd546 100644 --- a/usr/src/test/zfs-tests/tests/functional/mmp/mmp.cfg +++ b/usr/src/test/zfs-tests/tests/functional/mmp/mmp.cfg @@ -18,8 +18,8 @@ # Copyright 2019 Joyent, Inc. # -export PREV_UBER="/var/tmp/zfs-test/mmp-uber-prev.txt" -export CURR_UBER="/var/tmp/zfs-test/mmp-uber-curr.txt" +export PREV_UBER="$TEST_BASE_DIR/mmp-uber-prev.txt" +export CURR_UBER="$TEST_BASE_DIR/mmp-uber-curr.txt" export DISK=${DISKS%% *} export HOSTID_FILE="/etc/hostid" @@ -30,7 +30,7 @@ export TXG_TIMEOUT_LONG=5000 export TXG_TIMEOUT_DEFAULT=5 export MMP_POOL=mmppool -export MMP_DIR=/var/tmp/zfs-test/mmp +export MMP_DIR=$TEST_BASE_DIR/mmp export MMP_CACHE=$MMP_DIR/zpool.cache export MMP_ZTEST_LOG=$MMP_DIR/ztest.log export MMP_HISTORY=100 diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh index 415c8bdc5e..0ff8fcf97b 100644 --- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh +++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh @@ -13,6 +13,7 @@ # # Copyright (c) 2012, 2016 by Delphix. All rights reserved. +# Copyright 2019 Joyent, Inc. # . $STF_SUITE/include/libtest.shlib @@ -42,12 +43,12 @@ log_assert "nopwrite works for sync writes" log_must zfs set compress=on $origin log_must zfs set checksum=sha256 $origin -gnu_dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS oflag=sync \ +dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS oflag=sync \ conv=notrunc >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed." zfs snapshot $origin@a || log_fail "zfs snap failed" log_must zfs clone $origin@a $origin/clone -gnu_dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \ +dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \ oflag=sync conv=notrunc >/dev/null 2>&1 || log_fail "dd failed." log_must verify_nopwrite $origin $origin@a $origin/clone |