From dd17dd7252de9a6a22e92f27a2a3cb5ce12224b2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 21:35:00 +0200 Subject: Merging debian version 2.40-1. Signed-off-by: Daniel Baumann --- .../fadvise-test-test-with-64k-blocks.patch | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch (limited to 'debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch') diff --git a/debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch b/debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch deleted file mode 100644 index 772784c..0000000 --- a/debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:45:10 +0200 -Subject: fadvise: (test) test with 64k blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -This will allow the tests to also pass on systems with 64k pagesizes. - -Closes #2249 -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 26 +++++++++++++------------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index 25f23e0..e7bb26b 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES SIZE FILE -- 32K 32K ddtest -+ RES SIZE FILE -+ 512K 512K ddtest - - whole file - status: 0 --RES SIZE FILE -- 0B 32K ddtest -+RES SIZE FILE -+ 0B 512K ddtest - --offset: 8192 -+offset: 131072 - status: 0 --RES SIZE FILE -- 8K 32K ddtest -+ RES SIZE FILE -+ 128K 512K ddtest - --length: 16384 -+length: 262144 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - --offset: 8192, length: 16384 fd: 42 -+offset: 131072, length: 262144 fd: 42 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 6c4298e..45dcb91 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4096 -+BS=65536 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" -- cgit v1.2.3