Merging debian version 2.40-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 13 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index a3b74a0..b78d014 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+util-linux (2.40-4) experimental; urgency=medium
+
+  * test: fix marking of fadvise/drop as known failed
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Wed, 03 Apr 2024 23:03:28 +0200
+
 util-linux (2.40-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch b/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch
index a876211..f61bf60 100644
--- a/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch
+++ b/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch
@@ -8,16 +8,16 @@ buildds build on a tmpfs, but this is not visible inside the build environment.
  1 file changed, 3 insertions(+)
 
 diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 45dcb91..044f33a 100755
+index 45dcb91..c01e16c 100755
 --- a/tests/ts/fadvise/drop
 +++ b/tests/ts/fadvise/drop
-@@ -3,6 +3,9 @@
- TS_TOPDIR="${0%/*}/../.."
- TS_DESC="drop page caches related to a file"
+@@ -6,6 +6,9 @@ TS_DESC="drop page caches related to a file"
+ . "$TS_TOPDIR"/functions.sh
+ ts_init "$*"
  
 +# fails on Debian buildds, because the buildds use tmpfs hidden behind an unshare namespace.
 +TS_KNOWN_FAIL="yes"
 +
- . "$TS_TOPDIR"/functions.sh
- ts_init "$*"
- 
+ ts_check_test_command "$TS_CMD_FADVISE"
+ ts_check_test_command "$TS_CMD_FINCORE"
+ ts_check_test_command "$TS_CMD_FINDMNT"