From ba779f7f7102bf9cc96eb7c7ba577e283d1a0f63 Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Mon, 29 Jan 2018 15:33:57 -0700 Subject: [PATCH] OpenZFS 9004 - Some ZFS tests used files removed with 32 bit kernel Authored by: John Wren Kennedy Reviewed by: Igor Kozhukhov Reviewed by: Matthew Ahrens Reviewed by: Brian Behlendorf Reviewed by: George Melikov Approved by: Dan McDonald Ported-by: Giuseppe Di Natale OpenZFS-issue: https://www.illumos.org/issues/9004 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/fafe9b241f Closes #7149 --- tests/zfs-tests/include/commands.cfg | 1 + tests/zfs-tests/tests/functional/rsend/send-cD.ksh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg index 113b83c75..e6f04060c 100644 --- 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 c51788f81..ceface9db 100755 --- 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"