From 022e1ea44bfec8eb3dbcdc1c6b30f6b2d6de7e50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 23:16:59 +0200 Subject: Merging debian version 2.40-3. Signed-off-by: Daniel Baumann --- debian/changelog | 12 +++++++++++ ...-fadvise-drop-as-known-failing-on-buildds.patch | 23 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 36 insertions(+) create mode 100644 debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch diff --git a/debian/changelog b/debian/changelog index 7851830..0966581 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +util-linux (2.40-3) experimental; urgency=medium + + * tests: mark fadvise/drop as known failing on buildds. + Per discussion on #debian-buildd. The buildds have always used tmpfs as the + build location, and with schroot this is visible to the util-linux tests. + They in turn disable fadvise/drop, as it does not work on tmpfs. With the + unshare backend, the actual backing filesystem is hidden, so the test gets + run and fails. + * Remove build-time lsfd debugging + + -- Chris Hofstaedtler Tue, 02 Apr 2024 21:58:11 +0200 + util-linux (2.40-2~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 new file mode 100644 index 0000000..a876211 --- /dev/null +++ b/debian/patches/debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch @@ -0,0 +1,23 @@ +From: Chris Hofstaedtler +Date: Tue, 2 Apr 2024 21:52:47 +0200 +Subject: tests: mark fadvise/drop as known failing on buildds + +buildds build on a tmpfs, but this is not visible inside the build environment. +--- + tests/ts/fadvise/drop | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 45dcb91..044f33a 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" + ++# fails on Debian buildds, because the buildds use tmpfs hidden behind an unshare namespace. ++TS_KNOWN_FAIL="yes" ++ + . "$TS_TOPDIR"/functions.sh + ts_init "$*" + diff --git a/debian/patches/series b/debian/patches/series index 5b35dd8..9fa3f16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,6 @@ debian/sensible-pager.patch debian/tests-mark-lsfd-tests-failing-in-sbuild.patch upstream/lsfd-add-LSFD_DEBUG-env-var-for-debugging.patch upstream/tests-test_mkfds-sockdiag-verify-the-recived-message.patch +debian/tests-mark-fadvise-drop-as-known-failing-on-buildds.patch progress-linux/0001-agetty-prompt.patch progress-linux/0002-login-prompt.patch -- cgit v1.2.3