c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: replace all uses of /var/tmp with TEST_BASE_DIR

Browse Source 
The operator can override TEST_BASE_DIR by setting its source var
FILEDIR through zfs-tests.sh -d. There were a handful of cases where
this was not honoured.

By default FILEDIR (and so TEST_BASE_DIR) is /var/tmp, so there should
be no functional change if the operator does nothing.

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
This commit is contained in:
Rob Norris
2025-02-14 21:24:41 +11:00
committed by Tony Hutter
parent f65fc98a8c
commit 4afec534cc
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/include/default.cfg.in
+1 -1
View File
@@ -184,7 +184,7 @@ Linux)
DEV_RDSKDIR="/dev"
DEV_MPATHDIR="/dev/mapper"
ZEDLET_DIR="/var/tmp/zed"
ZEDLET_DIR="$TEST_BASE_DIR/zed"
ZED_LOG="$ZEDLET_DIR/zed.log"
ZED_DEBUG_LOG="$ZEDLET_DIR/zed.debug.log"
VDEVID_CONF="$ZEDLET_DIR/vdev_id.conf"
tests/zfs-tests/include/libtest.shlib
+4 -4
View File
@@ -915,7 +915,7 @@ function set_partition
log_fail "The slice, size or disk name is unspecified."
fi
typeset format_file=/var/tmp/format_in.$$
typeset format_file="$TEST_BASE_DIR"/format_in.$$
echo "partition" >$format_file
echo "$slicenum" >> $format_file
@@ -2404,7 +2404,7 @@ function add_user #<group_name> <user_name> <basedir>
{
typeset group=$1
typeset user=$2
typeset basedir=${3:-"/var/tmp"}
typeset basedir=${3:-"$TEST_BASE_DIR"}
if ((${#group} == 0 || ${#user} == 0)); then
log_fail "group name or user name are not defined."
@@ -2434,7 +2434,7 @@ function add_user #<group_name> <user_name> <basedir>
function del_user #<logname> <basedir>
{
typeset user=$1
typeset basedir=${2:-"/var/tmp"}
typeset basedir=${2:-"$TEST_BASE_DIR"}
if ((${#user} == 0)); then
log_fail "login name is necessary."
@@ -3184,7 +3184,7 @@ function zed_start
return
fi
# ZEDLET_DIR=/var/tmp/zed
# ZEDLET_DIR=$TEST_BASE_DIR/zed
if [[ ! -d $ZEDLET_DIR ]]; then
log_must mkdir $ZEDLET_DIR
fi