From c6c0d30016ff344a91aacc8057d5fb392c5ea9c7 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Mon, 16 Aug 2021 19:38:34 -0400 Subject: [PATCH] ZTS: Avoid unset $tmpdir in redacted_panic The redacted_send tests make use of a $tmpdir variable, except in redacted_send/redacted_panic the variable is never defined. Use $TEST_BASE_DIR instead. Clean up the stream file after the test. Reviewed-by: John Kennedy Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #12455 --- .../tests/functional/redacted_send/redacted_panic.ksh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 bf3b17f358..032d1fb91a 100755 --- a/tests/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh +++ b/tests/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh @@ -28,9 +28,15 @@ typeset ds_name="panic" typeset sendfs="$POOL/$ds_name" typeset recvfs="$POOL2/$ds_name" typeset clone="$POOL/${ds_name}_clone" -typeset stream=$(mktemp $tmpdir/stream.XXXX) +typeset stream=$(mktemp $TEST_BASE_DIR/stream.XXXX) -log_onexit redacted_cleanup $sendfs $recvfs +function cleanup +{ + redacted_cleanup $sendfs $recvfs + rm -f $stream +} + +log_onexit cleanup log_must zfs create -o recsize=8k $sendfs log_must dd if=/dev/urandom of=/$sendfs/file bs=1024k count=2048