summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 21:17:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 21:17:27 +0000
commit3f222f3db5b03395e4fc652c59acad978b026846 (patch)
treea22a8c040e706c847297fcccd5df4a5ce38706e3
parentAdding debian version 2.40-3. (diff)
downloadutil-linux-3f222f3db5b03395e4fc652c59acad978b026846.tar.xz
util-linux-3f222f3db5b03395e4fc652c59acad978b026846.zip
Adding debian version 2.40-4.debian/2.40-4
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch14
2 files changed, 13 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 6565874..c716faf 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) experimental; urgency=medium
* tests: mark fadvise/drop as known failing on buildds.
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"