diff --git a/tests/zfs-tests/tests/functional/acl/off/posixmode.ksh b/tests/zfs-tests/tests/functional/acl/off/posixmode.ksh index df278ae2366c..2028265e0891 100755 --- a/tests/zfs-tests/tests/functional/acl/off/posixmode.ksh +++ b/tests/zfs-tests/tests/functional/acl/off/posixmode.ksh @@ -130,7 +130,7 @@ function test_posix_mode # base } # Sanity check on tmpfs first -tmpdir=$(TMPDIR=$TEST_BASE_DIR mktemp -d) +tmpdir=$(mktemp -d) log_must mount -t tmpfs tmp $tmpdir log_must chmod 777 $tmpdir diff --git a/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh b/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh index 552a27e98102..977d9048e5b1 100755 --- a/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh @@ -40,8 +40,8 @@ # dbufstat and the dbufs kstat output # -DBUFSTATS_FILE=$(mktemp $TEST_BASE_DIR/dbufstats.out.XXXXXX) -DBUFS_FILE=$(mktemp $TEST_BASE_DIR/dbufs.out.XXXXXX) +DBUFSTATS_FILE=$(mktemp -t dbufstats.out.XXXXXX) +DBUFS_FILE=$(mktemp -t dbufs.out.XXXXXX) function cleanup { diff --git a/tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh b/tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh index 2908895d0c6a..3db22443bdfa 100755 --- a/tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh @@ -42,7 +42,7 @@ # 8. Ensure that at least some dbufs moved to the mfu list in the ARC # -DBUFS_FILE=$(mktemp $TEST_BASE_DIR/dbufs.out.XXXXXX) +DBUFS_FILE=$(mktemp -t dbufs.out.XXXXXX) function cleanup { diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh index 15760398127c..3a0382867de6 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh @@ -48,8 +48,8 @@ function cleanup log_assert "Verify that 'zfs send' drills appropriate holes" log_onexit cleanup -streamfile=$(mktemp $TESTDIR/file.XXXXXX) -vdev=$(mktemp $TEST_BASE_DIR/file.XXXXXX) +streamfile=$(mktemp) +vdev=$(mktemp) function test_pool diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh index 4d6005d2cb02..ec794782375d 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh @@ -160,7 +160,7 @@ while (( i < ${#pools[*]} )); do ((i = i + 1)) done -VDEV_FILE=$(mktemp $TEST_BASE_DIR/tmp.XXXXXX) +VDEV_FILE=$(mktemp) log_must mkfile -n 128M $VDEV_FILE log_must zpool create overflow $VDEV_FILE diff --git a/tests/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh b/tests/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh index a2438c2cd731..7e4f3f081477 100755 --- a/tests/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh +++ b/tests/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh @@ -28,7 +28,7 @@ typeset ds_name="panic" typeset sendfs="$POOL/$ds_name" typeset recvfs="$POOL2/$ds_name" typeset clone="$POOL/${ds_name}_clone" -typeset stream=$(mktemp $TEST_BASE_DIR/stream.XXXX) +typeset stream=$(mktemp -t stream.XXXX) function cleanup { diff --git a/tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh b/tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh index d9e44d332e05..4c78e3ab2ee9 100755 --- a/tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh @@ -63,7 +63,7 @@ function cleanup log_assert "Verify an archive of a file system is identical to " \ "an archive of its snapshot." -SNAPSHOT_TARDIR="$(mktemp -d /tmp/zfstests_snapshot_002.XXXXXX)" +SNAPSHOT_TARDIR="$(mktemp -t -d zfstests_snapshot_002.XXXXXX)" log_onexit cleanup typeset -i COUNT=21 diff --git a/tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh b/tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh index e34a50941470..392869bf83ad 100755 --- a/tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh @@ -72,7 +72,7 @@ function cleanup log_assert "Verify that an archive of a dataset is identical to " \ "an archive of the dataset's snapshot." -SNAPSHOT_TARDIR="$(mktemp -d /tmp/zfstests_snapshot_006.XXXXXX)" +SNAPSHOT_TARDIR="$(mktemp -t -d zfstests_snapshot_006.XXXXXX)" log_onexit cleanup typeset -i COUNT=21 diff --git a/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh b/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh index e6ad25f23f93..4f6ed775ecab 100755 --- a/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh +++ b/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh @@ -58,7 +58,7 @@ log_onexit user_ns_cleanup log_must zfs create -o zoned=on "$TESTPOOL/userns" # 1. Try to pass a non-namespace file to zfs zone. -temp_file="$(TMPDIR=$TEST_BASE_DIR mktemp)" +temp_file="$(mktemp)" log_mustnot zfs zone "$temp_file" "$TESTPOOL/userns" # 2. Try to pass a non-namespace and non-existent file to zfs zone. diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh index 9ebd5b149118..8b10813c9f1a 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh @@ -47,8 +47,8 @@ if ! is_linux ; then log_unsupported "Only linux supports dd with oflag=dsync for FUA writes" fi -typeset datafile1="$(mktemp zvol_misc_fua1.XXXXXX)" -typeset datafile2="$(mktemp zvol_misc_fua2.XXXXXX)" +typeset datafile1="$(mktemp -t zvol_misc_fua1.XXXXXX)" +typeset datafile2="$(mktemp -t zvol_misc_fua2.XXXXXX)" typeset zvolpath=${ZVOL_DEVDIR}/$TESTPOOL/$TESTVOL function cleanup diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh index 47cc42b9be7d..329757cce770 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh @@ -65,8 +65,8 @@ if ! is_physical_device $DISKS; then log_unsupported "This directory cannot be run on raw files." fi -typeset datafile1="$(mktemp zvol_misc_flags1.XXXXXX)" -typeset datafile2="$(mktemp zvol_misc_flags2.XXXXXX)" +typeset datafile1="$(mktemp -t zvol_misc_flags1.XXXXXX)" +typeset datafile2="$(mktemp -t zvol_misc_flags2.XXXXXX)" typeset zvolpath=${ZVOL_DEVDIR}/$TESTPOOL/$TESTVOL function cleanup diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress.ksh index 3431d33d97d0..8d580911dea8 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress.ksh @@ -57,7 +57,7 @@ biggest_zvol_size_possible=$(largest_volsize_from_pool $TESTPOOL) typeset -f each_zvol_size=$(( floor($biggest_zvol_size_possible * 0.9 / \ $num_zvols ))) -typeset tmpdir="$(mktemp -d zvol_stress_fio_state.XXXXXX)" +typeset tmpdir="$(mktemp -t -d zvol_stress_fio_state.XXXXXX)" function create_zvols {