From 051fa788adc25c82bdf68466558e4f45c6fe6d87 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Apr 2021 14:37:09 +0200
Subject: [PATCH] Skip all tests using /proc and /sys in LXC containers

These tests fail in S/390 Travis CI build, so just don't run them at all
there, as we already did for a couple of tests using /proc that also
failed in other LXC-based builds.
---
 tests/file/filetest.cpp         | 10 ++++++----
 tests/textfile/textfiletest.cpp | 11 ++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp
index f6d95146b3..0c38fe69ef 100644
--- a/tests/file/filetest.cpp
+++ b/tests/file/filetest.cpp
@@ -141,6 +141,11 @@ void FileTestCase::TempFile()
 // Check that GetSize() works correctly for special files.
 TEST_CASE("wxFile::Special", "[file][linux][special-file]")
 {
+    // LXC containers don't (always) populate /proc and /sys, so skip these
+    // tests there.
+    if ( IsRunningInLXC() )
+        return;
+
     // We can't test /proc/kcore here, unlike in the similar
     // wxFileName::GetSize() test, as wxFile must be able to open it (at least
     // for reading) and usually we don't have the permissions to do it.
@@ -151,10 +156,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
 
     wxString s;
     CHECK( fileProc.ReadAll(&s) );
-
-    // /proc files seem to be always empty in LXC containers.
-    if ( !IsRunningInLXC() )
-        CHECK( !s.empty() );
+    CHECK( !s.empty() );
 
     // All files in /sys have the size of one kernel page, even if they don't
     // have that much data in them.
diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index cc9e9cfbf4..4dfd597c18 100644
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -341,15 +341,16 @@ void TextFileTestCase::ReadBig()
 // correspond to the real amount of data in them, works.
 TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]")
 {
+    // LXC containers don't (always) populate /proc and /sys, so skip these
+    // tests there.
+    if ( IsRunningInLXC() )
+        return;
+
     SECTION("/proc")
     {
         wxTextFile f;
         CHECK( f.Open("/proc/cpuinfo") );
-
-        // /proc files seem to be always empty in LXC containers, so skip this
-        // check there.
-        if ( !IsRunningInLXC() )
-            CHECK( f.GetLineCount() > 1 );
+        CHECK( f.GetLineCount() > 1 );
     }
 
     SECTION("/sys")