Sync from SUSE:SLFO:1.1 wxWidgets-3_2 revision b2ee5008846401d596a1d8c0904ab1bb

This commit is contained in:
Adrian Schröter 2024-11-11 11:03:20 +01:00
parent 08e987de44
commit e44acd9f25
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,29 @@
https://github.com/wxWidgets/wxWidgets/pull/24768
From 2d943fd8f34816b3ad16b532132992a2523179e2 Mon Sep 17 00:00:00 2001
From: Christian Boltz <github-wxwidgets@cboltz.de>
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;

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 7 11:04:00 UTC 2024 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
- Add textfiletest-fix-file-exists.diff to fix /sys/power/state
condition check (backported from Factory, see obs#1194957)
-------------------------------------------------------------------
Sun Jan 21 09:21:37 UTC 2024 - Cliff Zhao <qzhao@suse.com>

View File

@ -83,6 +83,7 @@ Source6: wxpython-mkdiff.sh
Patch0: soversion.diff
Patch1: autoconf-2_72.diff
Patch2: wxWidgets-3_2-Fix-test-suite-on-Linux-s390x-architectures.patch
Patch3: textfiletest-fix-file-exists.diff
%if "%{flavor}" == "doc"
BuildRequires: doxygen
BuildRequires: fdupes