This repository was archived by the owner on Nov 7, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +19
-15
lines changed Expand file tree Collapse file tree 5 files changed +19
-15
lines changed Original file line number Diff line number Diff line change 10
10
#
11
11
12
12
#
13
- # Copyright (c) 2016 by Delphix. All rights reserved.
13
+ # Copyright (c) 2016, 2018 by Delphix. All rights reserved.
14
14
#
15
15
16
16
#
22
22
# and maintenance.
23
23
#
24
24
export USR_BIN_FILES =' awk
25
+ base64
25
26
basename
26
27
bc
27
28
bunzip2
Original file line number Diff line number Diff line change 26
26
#
27
27
28
28
#
29
- # Copyright (c) 2016 by Delphix. All rights reserved.
29
+ # Copyright (c) 2016, 2018 by Delphix. All rights reserved.
30
30
#
31
31
32
32
. $STF_SUITE /tests/functional/acl/acl_common.kshlib
@@ -53,8 +53,7 @@ function cleanup
53
53
if datasetexists $TESTPOOL /$TESTFS1 ; then
54
54
log_must zfs destroy -f $TESTPOOL /$TESTFS1
55
55
fi
56
- [[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
57
- [[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR /*
56
+ log_must rm -rf $TESTDIR1 $TESTDIR /* $mytestfile
58
57
}
59
58
60
59
log_assert " Verify that 'cp [-p]' supports ZFS ACLs."
@@ -68,7 +67,9 @@ log_must chmod 777 $TESTDIR1
68
67
69
68
# Define target directory.
70
69
dstdir=$TESTDIR1 /dstdir.$$
71
- mytestfile=/kernel/drv/zfs
70
+ mytestfile=$( mktemp -t file.XXXX)
71
+ log_must dd if=/dev/urandom of=$mytestfile bs=1024k count=1
72
+ log_must chmod 644 $mytestfile
72
73
73
74
for user in root $ZFS_ACL_STAFF1 ; do
74
75
# Set the current user
Original file line number Diff line number Diff line change 28
28
#
29
29
30
30
#
31
- # Copyright (c) 2016 by Delphix. All rights reserved.
31
+ # Copyright (c) 2016, 2018 by Delphix. All rights reserved.
32
32
#
33
33
34
34
. $STF_SUITE /tests/functional/acl/acl_common.kshlib
@@ -57,8 +57,7 @@ function cleanup
57
57
if (( ${# orig_dir} != 0 )) ; then
58
58
cd $orig_dir
59
59
fi
60
- [[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
61
- [[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR /*
60
+ log_must rm -rf $TESTDIR1 $TESTDIR /* $mytestfile
62
61
}
63
62
64
63
log_assert " Verify that 'cpio' command supports to archive ZFS ACLs & xattrs."
@@ -81,7 +80,9 @@ CPIOFILE=cpiofile.$$
81
80
file=$TESTFILE0
82
81
dir=dir.$$
83
82
orig_dir=$PWD
84
- mytestfile=/kernel/drv/zfs
83
+ mytestfile=$( mktemp -t file.XXXX)
84
+ log_must dd if=/dev/urandom of=$mytestfile bs=1024k count=1
85
+ log_must chmod 644 $mytestfile
85
86
86
87
typeset user
87
88
for user in root $ZFS_ACL_STAFF1 ; do
Original file line number Diff line number Diff line change 28
28
#
29
29
30
30
#
31
- # Copyright (c) 2016 by Delphix. All rights reserved.
31
+ # Copyright (c) 2016, 2018 by Delphix. All rights reserved.
32
32
#
33
33
34
34
. $STF_SUITE /tests/functional/acl/acl_common.kshlib
@@ -57,8 +57,7 @@ function cleanup
57
57
fi
58
58
59
59
(( ${# cwd} != 0 )) && cd $cwd
60
- [[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
61
- [[ -d $TESTDIR / ]] && log_must rm -rf $TESTDIR /*
60
+ log_must rm -rf $TESTDIR1 $TESTDIR /* $mytestfile
62
61
}
63
62
64
63
log_assert " Verify that 'tar' command supports to archive ZFS ACLs & xattrs."
@@ -67,7 +66,9 @@ log_onexit cleanup
67
66
68
67
set -A ops " A+user:other1:add_file:allow" " A+everyone@:execute:allow" " a-x" \
69
68
" 777"
70
- mytestfile=/kernel/drv/zfs
69
+ mytestfile=$( mktemp -t file.XXXX)
70
+ log_must dd if=/dev/urandom of=$mytestfile bs=1024k count=1
71
+ log_must chmod 644 $mytestfile
71
72
72
73
TARFILE=tarfile.$$ .tar
73
74
cwd=$PWD
Original file line number Diff line number Diff line change 12
12
#
13
13
14
14
#
15
- # Copyright (c) 2015 by Delphix. All rights reserved.
15
+ # Copyright (c) 2015, 2018 by Delphix. All rights reserved.
16
16
#
17
17
18
18
. $STF_SUITE /tests/functional/rsend/rsend.kshlib
@@ -46,7 +46,7 @@ log_must zfs create -o compress=lz4 $sendfs
46
46
log_must zfs create -o compress=lz4 $recvfs
47
47
typeset dir=$( get_prop mountpoint $sendfs )
48
48
# Don't use write_compressible: we want compressible but undedupable data here.
49
- log_must cp /kernel/genunix $dir /file
49
+ log_must eval " dd if=/dev/urandom bs=1024k count=4 | base64 > $dir /file"
50
50
log_must zfs snapshot $sendfs @snap0
51
51
log_must eval " zfs send -D -c $sendfs @snap0 >$stream0 "
52
52
You can’t perform that action at this time.
0 commit comments