c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: acl group path cleanup

Browse Source 
Removing hardcoded paths in acl group tests

Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #7777
This commit is contained in:
bunder2015 2018-08-13 11:22:41 -04:00 committed by Brian Behlendorf
parent 604016054e
commit d02fa81c78
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/zfs-tests/tests/functional/acl/acl.cfg
View File

@ -26,7 +26,7 @@
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
export NISSTAFILE=/var/tmp/nis_state export NISSTAFILE=$TEST_BASE_DIR/nis_state
export TESTFILE=testfile$$ export TESTFILE=testfile$$
export TESTFILE0=testfile0.$$ export TESTFILE0=testfile0.$$
export TESTFILE2=testfile2.$$ export TESTFILE2=testfile2.$$

10
tests/zfs-tests/tests/functional/acl/acl_common.kshlib
View File

@ -92,8 +92,8 @@ function compare_acls #<src> <tgt>
(( ${#src} == 0 || ${#tgt} == 0 )) && return 1 (( ${#src} == 0 || ${#tgt} == 0 )) && return 1
[[ $src == $tgt ]] && return 0 [[ $src == $tgt ]] && return 0
typeset tmpsrc=/tmp/compare_acls.src.$$ typeset tmpsrc=$TEST_BASE_DIR/compare_acls.src.$$
typeset tmptgt=/tmp/compare_acls.tgt.$$ typeset tmptgt=$TEST_BASE_DIR/compare_acls.tgt.$$
get_acl $src > $tmpsrc get_acl $src > $tmpsrc
get_acl $tgt > $tmptgt get_acl $tgt > $tmptgt
@ -160,8 +160,8 @@ function compare_xattrs #<src> <tgt>
(( ${#src} == 0 || ${#tgt} == 0 )) && return 1 (( ${#src} == 0 || ${#tgt} == 0 )) && return 1
[[ $src == $tgt ]] && return 0 [[ $src == $tgt ]] && return 0
typeset tmpsrc=/tmp/compare_xattrs.src.$$ typeset tmpsrc=$TEST_BASE_DIR/compare_xattrs.src.$$
typeset tmptgt=/tmp/compare_xattrs.tgt.$$ typeset tmptgt=$TEST_BASE_DIR/compare_xattrs.tgt.$$
get_xattr $src > $tmpsrc get_xattr $src > $tmpsrc
get_xattr $tgt > $tmptgt get_xattr $tgt > $tmptgt
@ -276,7 +276,7 @@ function get_ACE #<file or dir name> <specified number> <verbose|compact>
typeset format=${3:-verbose} typeset format=${3:-verbose}
typeset -i next_num=-1 typeset -i next_num=-1
typeset tmpfile=/tmp/tmp_get_ACE.$$ typeset tmpfile=$TEST_BASE_DIR/tmp_get_ACE.$$
typeset line="" typeset line=""
typeset args typeset args

1
tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh
View File

@ -36,7 +36,6 @@
verify_runnable "both" verify_runnable "both"
log_assert "Verify regular and default POSIX ACLs survive remount" 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_str1="^group:$ZFS_ACL_STAFF_GROUP:-wx$"
typeset acl_str2="^default:group:$ZFS_ACL_STAFF_GROUP:-wx$" typeset acl_str2="^default:group:$ZFS_ACL_STAFF_GROUP:-wx$"
typeset ACLDIR="$TESTDIR/dir.1" typeset ACLDIR="$TESTDIR/dir.1"