From 2005e50b27128dccc067d7aa7755553e5ea4eaa7 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 7 Apr 2020 03:30:44 +0200 Subject: [PATCH] Fix tests when run on s390x arch Don't assume "mem" is always present in /sys/power/state, but hopefully one of "mem" and "disk" is. --- 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 eda450d1f3..d76cb1b244 100644 --- a/tests/textfile/textfiletest.cpp +++ b/tests/textfile/textfiletest.cpp @@ -357,7 +357,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]") CHECK( f.Open("/sys/power/state") ); REQUIRE( f.GetLineCount() == 1 ); INFO( "/sys/power/state contains \"" << f[0] << "\"" ); - CHECK( f[0].find("mem") != wxString::npos ); + CHECK( (f[0].find("mem") != wxString::npos || f[0].find("disk") != wxString::npos) ); } }