OpenZFS 9004 - Some ZFS tests used files removed with 32 bit kernel

Authored by: John Wren Kennedy <john.kennedy@delphix.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: George Melikov <mail@gmelikov.ru>
Approved by: Dan McDonald <danmcd@joyent.com>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>
OpenZFS-issue: https://www.illumos.org/issues/9004
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/fafe9b241f
Closes #7149

diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg
index 113b83c7595e607fb1edf3e64893ab6c6e698874..e6f04060ca281d98dceb06925f4b09241fd36755 100644 (file)
--- a/tests/zfs-tests/include/commands.cfg
+++ b/tests/zfs-tests/include/commands.cfg
@@ -10,6 +10,7 @@
 export SYSTEM_FILES='arp
     awk
     attr
+    base64
     basename
     bc
     blkid

diff --git a/tests/zfs-tests/tests/functional/rsend/send-cD.ksh b/tests/zfs-tests/tests/functional/rsend/send-cD.ksh
index c51788f8105d0199217c2c3cb2818033e9c7b5e8..ceface9dbc09893558d099e23a2674e2632dd0b3 100755 (executable)
--- a/tests/zfs-tests/tests/functional/rsend/send-cD.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send-cD.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2018 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -46,7 +46,7 @@ log_must zfs create -o compress=lz4 $sendfs
 log_must zfs create -o compress=lz4 $recvfs
 typeset dir=$(get_prop mountpoint $sendfs)
 # Don't use write_compressible: we want compressible but undedupable data here.
-log_must file_write -o overwrite -f $dir/file -d R -b 4096 -c 1000
+log_must eval "dd if=/dev/urandom bs=1024k count=4 | base64 >$dir/file"
 log_must zfs snapshot $sendfs@snap0
 log_must eval "zfs send -D -c $sendfs@snap0 >$stream0"