From 4eb0851d71280969cb041f1a0fcb1ae32c45c4ea Mon Sep 17 00:00:00 2001 From: Christos Longros <98426896+chrislongros@users.noreply.github.com> Date: Thu, 4 Jun 2026 02:33:19 +0200 Subject: [PATCH] ZTS: fix mktemp usage on FreeBSD On FreeBSD -t takes a required prefix argument. Use "mktemp -d $TEST_BASE_DIR/..." instead. Reviewed-by: Tony Hutter Reviewed-by: Brian Behlendorf Signed-off-by: Christos Longros Closes #18621 --- tests/test-runner/bin/zts-report.py.in | 2 -- tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh | 2 +- tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh | 2 +- .../zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress.ksh | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index 2cbd2f02a31..a80112d914e 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -256,7 +256,6 @@ maybe = { 'send_xdr_encoding/xdr_bookmark_raw_with_write': ['FAIL', 18491], 'send_xdr_encoding/xdr_resume_bookmark_raw_with_write': ['FAIL', 18491], 'snapshot/clone_001_pos': ['FAIL', known_reason], - 'snapshot/snapshot_006_pos': ['FAIL', known_reason], 'snapshot/snapshot_009_pos': ['FAIL', 7961], 'snapshot/snapshot_010_pos': ['FAIL', 7961], 'snapused/snapused_004_pos': ['FAIL', 5513], @@ -279,7 +278,6 @@ if sys.platform.startswith('freebsd'): 'pool_checkpoint/checkpoint_big_rewind': ['FAIL', 12622], 'pool_checkpoint/checkpoint_indirect': ['FAIL', 12623], 'resilver/resilver_restart_001': ['FAIL', known_reason], - 'snapshot/snapshot_002_pos': ['FAIL', 14831], 'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', 16668], 'bclone/bclone_crossfs_corner_cases': ['SKIP', cfr_cross_reason], 'bclone/bclone_crossfs_corner_cases_limited': 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 ffc4e96f5a0..0f3b1a84d83 100755 --- a/tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh @@ -64,7 +64,7 @@ function cleanup log_assert "Verify an archive of a file system is identical to " \ "an archive of its snapshot." -SNAPSHOT_TARDIR="$(mktemp -t -d zfstests_snapshot_002.XXXXXX)" +SNAPSHOT_TARDIR="$(mktemp -d "$TEST_BASE_DIR/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 20d53eb5012..db8d820bdd1 100755 --- a/tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh @@ -73,7 +73,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 -t -d zfstests_snapshot_006.XXXXXX)" +SNAPSHOT_TARDIR="$(mktemp -d "$TEST_BASE_DIR/zfstests_snapshot_006.XXXXXX")" log_onexit cleanup typeset -i COUNT=21 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 9047f14bc81..0f18f2e5733 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 @@ -58,7 +58,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 -t -d zvol_stress_fio_state.XXXXXX)" +typeset tmpdir="$(mktemp -d "$TEST_BASE_DIR/zvol_stress_fio_state.XXXXXX")" log_must save_tunable VOL_USE_BLK_MQ log_must save_tunable VOL_REQUEST_SYNC