diff options
| author |   Sam James <sam@gentoo.org> | 2023-11-15 10:37:40 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-11-15 10:37:40 +0000 |
| commit | 13688d9b6994558d6e78d6f9a80da685d8bd299b (patch) | |
| tree | 0e43df17eef784a74650d729d07e35e058face39 /sys-apps/util-linux | |
| parent | profiles: drop obsolete mask for old util-linux (diff) | |
| download | gentoo-13688d9b6994558d6e78d6f9a80da685d8bd299b.tar.gz gentoo-13688d9b6994558d6e78d6f9a80da685d8bd299b.tar.bz2 gentoo-13688d9b6994558d6e78d6f9a80da685d8bd299b.zip | |
sys-apps/util-linux: backport sparc test fix
Test-only fix. Thanks to glaubitz for the heads-up!
Closes: https://bugs.gentoo.org/627532
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch | 23 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.39.2.ebuild | 4 |
2 files changed, 27 insertions, 0 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch new file mode 100644 index 000000000000..f69876fe0a18 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/627532 +https://github.com/util-linux/util-linux/commit/f5715c117e727d4ff45e0d8568f188753620356e + +From f5715c117e727d4ff45e0d8568f188753620356e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de> +Date: Mon, 13 Nov 2023 21:05:59 +0100 +Subject: [PATCH] fincore: (tests) also use nosize error file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.camel@physik.fu-berlin.de/ +Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> +--- a/tests/ts/fincore/count ++++ b/tests/ts/fincore/count +@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then + OUT_COLUMNS="PAGES,SIZE,FILE" + else + TS_EXPECTED+=".nosize" ++ TS_EXPECTED_ERR+=".nosize" + OUT_COLUMNS="PAGES,FILE" + fi + diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild index 94d37237dd40..6655149f15a6 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild @@ -95,6 +95,10 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch +) + pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)" |