From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 17 May 2024 06:30:33 +0000 (-0700)
Subject: dd: skip some alloc tests on ZFS
X-Git-Tag: v9.6~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52e024b7b78572091aee98b37958ceffc6432dca;p=thirdparty%2Fcoreutils.git

dd: skip some alloc tests on ZFS

* tests/dd/sparse.sh: Skip some tests on ZFS.
---

diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh
index 5194606aa1..1ac1920fff 100755
--- a/tests/dd/sparse.sh
+++ b/tests/dd/sparse.sh
@@ -58,7 +58,10 @@ kb_alloc() { du -k "$1"|cut -f1; }
 # skip the remaining tests.  On at least Solaris 10 with NFS,
 # file.in is reported to occupy <= 1KiB for about 50 seconds
 # after its creation.
-if test $(kb_alloc file.in) -gt 3000; then
+# Also, ZFS allocation reports can be delayed or off (problem
+# observed on Ubuntu 23.10), so don’t trust this test on ZFS.
+if test $(kb_alloc file.in) -gt 3000 && test "$(stat -f -c %T file.in)" != zfs
+then
 
   # Ensure NUL blocks smaller than the *output* block size are not made sparse.
   # Here, with a 2MiB block size, dd's conv=sparse must *not* introduce a hole.