From 6f8ff940169a3af8d2c616e349c007f2943c5dcd Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sat, 15 Feb 2025 14:41:19 +1100 Subject: [PATCH] ZTS: make uses of mktemp consistent In all cases, rely on mktemp itself to make the best decision about where to place the file or directory. In all cases, that decision will be $TMPDIR, which we have set globally. Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris Reviewed-by: Tony Hutter Reviewed-by: Tino Reichardt Reviewed-by: Igor Kozhukhov --- tests/zfs-tests/tests/functional/acl/off/posixmode.ksh | 2 +- tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh | 4 ++-- tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh | 2 +- .../tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh | 4 ++-- .../cli_root/zpool_import/zpool_import_rename_001_pos.ksh | 2 +- .../tests/functional/redacted_send/redacted_panic.ksh | 2 +- .../zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh | 2 +- .../zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh | 2 +- .../tests/functional/user_namespace/user_namespace_004.ksh | 2 +- .../tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh | 4 ++-- .../tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh | 4 ++-- .../tests/functional/zvol/zvol_stress/zvol_stress.ksh | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/zfs-tests/tests/functional/acl/off/posixmode.ksh b/tests/zfs-tests/tests/functional/acl/off/posixmode.ksh index df278ae23..2028265e0 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 552a27e98..977d9048e 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 2908895d0..3db22443b 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 157603981..3a0382867 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 4d6005d2c..ec7947823 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 a2438c2cd..7e4f3f081 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 d9e44d332..4c78e3ab2 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 e34a50941..392869bf8 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 e6ad25f23..4f6ed775e 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 9ebd5b149..8b10813c9 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 47cc42b9b..329757cce 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 3431d33d9..8d580911d 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 {