From 96fa1f90786bdfcd1066e09e103da11d7b6e96d1ed56f0d708e3690fd5c7b733 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 20 Aug 2024 21:41:25 +0000 Subject: [PATCH] Add textfiletest-fix-file-exists.diff (s390 build fix) --- textfiletest-fix-file-exists.diff | 29 +++++++++++++++++++++++++++++ wxWidgets-3_2.changes | 6 ++++++ wxWidgets-3_2.spec | 1 + 3 files changed, 36 insertions(+) create mode 100644 textfiletest-fix-file-exists.diff diff --git a/textfiletest-fix-file-exists.diff b/textfiletest-fix-file-exists.diff new file mode 100644 index 0000000..ec43389 --- /dev/null +++ b/textfiletest-fix-file-exists.diff @@ -0,0 +1,29 @@ +https://github.com/wxWidgets/wxWidgets/pull/24768 + + +From 2d943fd8f34816b3ad16b532132992a2523179e2 Mon Sep 17 00:00:00 2001 +From: Christian Boltz +Date: Tue, 20 Aug 2024 23:28:27 +0200 +Subject: [PATCH] textfiletest: fix skip condition + +... so that condition and skip message match. + +As a side effect, it also prevents a test failure if /sys/power/state +doesn't exist. +--- + tests/textfile/textfiletest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp +index 646d6818c90c..1a1347e85475 100644 +--- a/tests/textfile/textfiletest.cpp ++++ b/tests/textfile/textfiletest.cpp +@@ -342,7 +342,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") + + SECTION("/sys") + { +- if ( wxFile::Exists("/sys/power/state") ) ++ if ( !wxFile::Exists("/sys/power/state") ) + { + WARN("/sys/power/state doesn't exist, skipping test"); + return; diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 405b4c1..dc5f150 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 20 19:05:50 UTC 2024 - Christian Boltz + +- Add textfiletest-fix-file-exists.diff to fix a wrong skip + condition in the test (fixes the build on s390x) + ------------------------------------------------------------------- Thu May 16 13:40:01 UTC 2024 - Jan Engelhardt diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index f65fa41..e6e24ef 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -82,6 +82,7 @@ Source5: wxWidgets-3_2-rpmlintrc Source6: wxpython-mkdiff.sh Patch0: soversion.diff Patch1: autoconf-2_72.diff +Patch2: textfiletest-fix-file-exists.diff %if "%{flavor}" == "doc" BuildRequires: doxygen BuildRequires: fdupes