From d02fa81c7835f1cce54a0cfe3c010a0766f49165 Mon Sep 17 00:00:00 2001 From: bunder2015 Date: Mon, 13 Aug 2018 11:22:41 -0400 Subject: [PATCH] ZTS: acl group path cleanup Removing hardcoded paths in acl group tests Reviewed-by: Giuseppe Di Natale Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: bunder2015 Closes #7777 --- tests/zfs-tests/tests/functional/acl/acl.cfg | 2 +- tests/zfs-tests/tests/functional/acl/acl_common.kshlib | 10 +++++----- .../tests/functional/acl/posix/posix_003_pos.ksh | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/zfs-tests/tests/functional/acl/acl.cfg b/tests/zfs-tests/tests/functional/acl/acl.cfg index fbebe3884..8fa85d673 100644 --- a/tests/zfs-tests/tests/functional/acl/acl.cfg +++ b/tests/zfs-tests/tests/functional/acl/acl.cfg @@ -26,7 +26,7 @@ . $STF_SUITE/include/libtest.shlib -export NISSTAFILE=/var/tmp/nis_state +export NISSTAFILE=$TEST_BASE_DIR/nis_state export TESTFILE=testfile$$ export TESTFILE0=testfile0.$$ export TESTFILE2=testfile2.$$ diff --git a/tests/zfs-tests/tests/functional/acl/acl_common.kshlib b/tests/zfs-tests/tests/functional/acl/acl_common.kshlib index 0fe6d2b6a..a81cd76ba 100644 --- a/tests/zfs-tests/tests/functional/acl/acl_common.kshlib +++ b/tests/zfs-tests/tests/functional/acl/acl_common.kshlib @@ -92,8 +92,8 @@ function compare_acls # (( ${#src} == 0 || ${#tgt} == 0 )) && return 1 [[ $src == $tgt ]] && return 0 - typeset tmpsrc=/tmp/compare_acls.src.$$ - typeset tmptgt=/tmp/compare_acls.tgt.$$ + typeset tmpsrc=$TEST_BASE_DIR/compare_acls.src.$$ + typeset tmptgt=$TEST_BASE_DIR/compare_acls.tgt.$$ get_acl $src > $tmpsrc get_acl $tgt > $tmptgt @@ -160,8 +160,8 @@ function compare_xattrs # (( ${#src} == 0 || ${#tgt} == 0 )) && return 1 [[ $src == $tgt ]] && return 0 - typeset tmpsrc=/tmp/compare_xattrs.src.$$ - typeset tmptgt=/tmp/compare_xattrs.tgt.$$ + typeset tmpsrc=$TEST_BASE_DIR/compare_xattrs.src.$$ + typeset tmptgt=$TEST_BASE_DIR/compare_xattrs.tgt.$$ get_xattr $src > $tmpsrc get_xattr $tgt > $tmptgt @@ -276,7 +276,7 @@ function get_ACE # typeset format=${3:-verbose} typeset -i next_num=-1 - typeset tmpfile=/tmp/tmp_get_ACE.$$ + typeset tmpfile=$TEST_BASE_DIR/tmp_get_ACE.$$ typeset line="" typeset args diff --git a/tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh b/tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh index c45b2ecd1..dc6ef0d24 100755 --- a/tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh @@ -36,7 +36,6 @@ verify_runnable "both" log_assert "Verify regular and default POSIX ACLs survive remount" -typeset output=/tmp/zfs-posixacl.$$ typeset acl_str1="^group:$ZFS_ACL_STAFF_GROUP:-wx$" typeset acl_str2="^default:group:$ZFS_ACL_STAFF_GROUP:-wx$" typeset ACLDIR="$TESTDIR/dir.1" -- 2.40.0