Apply upstream patch to remove sparsify test

Closes: #1078282

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..4e34407
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch

diff --git a/debian/patches/sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch b/debian/patches/sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch
new file mode 100644 (file)
index 0000000..092295b
--- /dev/null
+++ b/debian/patches/sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch
@@ -0,0 +1,118 @@
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 20 Aug 2024 11:19:59 +0100
+Subject: sparsify: Remove test-virt-sparsify-in-place-fstrim-unsupported.sh
+
+With kernel 6.11.0 this test suddenly started to work, as if the minix
+filesystem in this kernel suddenly supports trimming.  I checked the
+kernel source and I can't find anything relevant so I'm not sure what
+happened.  In any case this test is of very marginal utility so just
+delete it.
+---
+ sparsify/Makefile.am                               |  4 +-
+ ...st-virt-sparsify-in-place-fstrim-unsupported.sh | 75 ----------------------
+ 2 files changed, 1 insertion(+), 78 deletions(-)
+ delete mode 100755 sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh
+
+diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
+index 5fb0461..ae922d1 100644
+--- a/sparsify/Makefile.am
++++ b/sparsify/Makefile.am
+@@ -22,7 +22,6 @@ EXTRA_DIST = \
+       test-virt-sparsify.sh \
+       test-virt-sparsify-docs.sh \
+       test-virt-sparsify-in-place.sh \
+-      test-virt-sparsify-in-place-fstrim-unsupported.sh \
+       virt-sparsify.pod
+ 
+ SOURCES_MLI = \
+@@ -141,8 +140,7 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
+ TESTS = \
+       test-virt-sparsify-docs.sh \
+       test-virt-sparsify.sh \
+-      test-virt-sparsify-in-place.sh \
+-      test-virt-sparsify-in-place-fstrim-unsupported.sh
++      test-virt-sparsify-in-place.sh
+ 
+ check-valgrind:
+       $(MAKE) VG="@VG@" check
+diff --git a/sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh b/sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh
+deleted file mode 100755
+index 91e87dd..0000000
+--- a/sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh
++++ /dev/null
+@@ -1,75 +0,0 @@
+-#!/bin/bash -
+-# libguestfs virt-sparsify --in-place test script
+-# Copyright (C) 2011-2023 Red Hat Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-
+-# Test that we do the right thing for filesystems where the fstrim
+-# operation is not supported.
+-#
+-# https://bugzilla.redhat.com/show_bug.cgi?id=1364347
+-#
+-# This test assumes that the kernel minix driver does not support
+-# fstrim.  It might become supported in a future kernel version in
+-# which case we could use a different filesystem for this test, or
+-# delete the test if we are confident that all common filesystems are
+-# supported.
+-
+-set -e
+-set -x
+-
+-$TEST_FUNCTIONS
+-skip_if_skipped
+-skip_unless_filesystem_available minix
+-
+-img=test-virt-sparsify-in-place-fstrim-unsupported.img
+-log=test-virt-sparsify-in-place-fstrim-unsupported.log
+-rm -f $img $log
+-
+-# Create a test filesystem with a single minix filesystem.
+-guestfish -N $img=fs:minix exit
+-
+-# This should warn.
+-virt-sparsify --in-place $img |& tee $log
+-
+-# Check the warning was emitted.
+-grep "warning:.*fstrim" $log
+-
+-# This should ignore the filesystem and not warn.
+-virt-sparsify --in-place --ignore /dev/sda1 $img |& tee $log
+-
+-if grep "warning:.*fstrim.*not supported" $log; then
+-    echo "$0: filesystem /dev/sda1 was not ignored"
+-    exit 1
+-fi
+-
+-# Create a test filesystem with minix and ext4 filesystems.
+-guestfish -N $img=bootroot:minix:ext4 exit
+-
+-# This should warn.
+-virt-sparsify --in-place $img |& tee $log
+-
+-# Check the warning was emitted.
+-grep "warning:.*fstrim" $log
+-
+-# This should ignore the filesystem and not warn.
+-virt-sparsify --in-place --ignore /dev/sda1 $img |& tee $log
+-
+-if grep "warning:.*fstrim.*not supported" $log; then
+-    echo "$0: filesystem /dev/sda1 was not ignored"
+-    exit 1
+-fi
+-
+-rm $img $log