diff options
author | Matoro Mahri <matoro_gentoo@matoro.tk> | 2024-02-02 15:27:14 -0500 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-03-08 20:00:43 +0000 |
commit | 1ee5d8e55affd61562ce219e17d5543af0a72215 (patch) | |
tree | 8534a552665d5ef03da574e6e63d1f50b63bb234 /x11-libs/wxGTK | |
parent | dev-perl/Tk: fix tests on 64-bit big-endian (diff) | |
download | gentoo-1ee5d8e55affd61562ce219e17d5543af0a72215.tar.gz gentoo-1ee5d8e55affd61562ce219e17d5543af0a72215.tar.bz2 gentoo-1ee5d8e55affd61562ce219e17d5543af0a72215.zip |
x11-libs/wxGTK: backport test fix for systems with CONFIG_PM=n
Tests currently fail on systems with CONFIG_PM=n set. Since this is
impossible to enable on some platforms, backport the upstream fix to
conditionally skip this test.
See: https://github.com/wxWidgets/wxWidgets/pull/24197
Bug: https://bugs.gentoo.org/916884
Signed-off-by: Matoro Mahri <matoro_gentoo@matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/35156
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch | 88 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild | 1 |
2 files changed, 89 insertions, 0 deletions
diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch new file mode 100644 index 000000000000..2adf03aef45b --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch @@ -0,0 +1,88 @@ +https://bugs.gentoo.org/916884 +https://github.com/wxWidgets/wxWidgets/pull/24197 + +From 891bfff867b7dc92ed6330ea46ee2dcfa5424ee0 Mon Sep 17 00:00:00 2001 +From: Cliff Zhao <qzhao@suse.com> +Date: Thu, 4 Jan 2024 08:01:00 +0100 +Subject: [PATCH] Fix testsuite failures on s390x + +``/sys/power/state`` does not exist on s390x platforms and certain +types of containers, so check that the file exist before running the +test case. + +Output from ``make check`` was: + + ./textfile/textfiletest.cpp:351 + ............................................................................... + + ./textfile/textfiletest.cpp:354: FAILED: + CHECK( f.Open("/sys/power/state") ) + with expansion: + false + + ./textfile/textfiletest.cpp:355: FAILED: + REQUIRE( f.GetLineCount() == 1 ) + with expansion: + 0 == 1 +--- + tests/file/filetest.cpp | 2 ++ + tests/filename/filenametest.cpp | 2 ++ + tests/textfile/textfiletest.cpp | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp +index 8902eb4d6684..fc3c90569480 100644 +--- a/tests/file/filetest.cpp ++++ b/tests/file/filetest.cpp +@@ -153,6 +153,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]") + CHECK( fileProc.ReadAll(&s) ); + CHECK( !s.empty() ); + ++ if ( wxFile::Exists("/sys/power/state") ) { + // All files in /sys have the size of one kernel page, even if they don't + // have that much data in them. + const long pageSize = sysconf(_SC_PAGESIZE); +@@ -163,6 +164,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]") + CHECK( fileSys.ReadAll(&s) ); + CHECK( !s.empty() ); + CHECK( s.length() < pageSize ); ++ } + } + + #endif // __LINUX__ +diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp +index 84356b39f719..ce2ec2af2760 100644 +--- a/tests/filename/filenametest.cpp ++++ b/tests/filename/filenametest.cpp +@@ -1040,9 +1040,11 @@ TEST_CASE("wxFileName::GetSizeSpecial", "[filename][linux][special-file]") + INFO( "size of /proc/kcore=" << size ); + CHECK( size > 0 ); + ++ if ( wxFile::Exists("/sys/power/state") ) { + // All files in /sys are one page in size, irrespectively of the size of + // their actual contents. + CHECK( wxFileName::GetSize("/sys/power/state") == sysconf(_SC_PAGESIZE) ); ++ } + } + + #endif // __LINUX__ +diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp +index f744ffc3271b..73467be8f85f 100644 +--- a/tests/textfile/textfiletest.cpp ++++ b/tests/textfile/textfiletest.cpp +@@ -348,6 +348,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") + CHECK( f.GetLineCount() > 1 ); + } + ++ if ( wxFile::Exists("/sys/power/state") ) { + SECTION("/sys") + { + wxTextFile f; +@@ -356,6 +357,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") + INFO( "/sys/power/state contains \"" << f[0] << "\"" ); + CHECK( (f[0].find("mem") != wxString::npos || f[0].find("disk") != wxString::npos) ); + } ++ } + } + + #endif // __LINUX__ diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild index b6f07556613f..90d412ce19a8 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild @@ -84,6 +84,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.2.1-wayland-control.patch" "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch" "${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch" + "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch" ) src_prepare() { |