Remove checks for LXC containers used under Travis CI only

As we don't use Travis CI any longer, we don't need these checks
neither.
This commit is contained in:
Vadim Zeitlin 2021-07-15 19:55:01 +02:00
parent a370de4caf
commit 9aae8fc81f
5 changed files with 0 additions and 31 deletions

View File

@ -141,11 +141,6 @@ 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.

View File

@ -949,9 +949,6 @@ TEST_CASE("wxFileName::Shortcuts", "[filename]")
// Check that GetSize() works correctly for special files.
TEST_CASE("wxFileName::GetSizeSpecial", "[filename][linux][special-file]")
{
if ( IsRunningInLXC() )
return;
wxULongLong size = wxFileName::GetSize("/proc/kcore");
INFO( "size of /proc/kcore=" << size );
CHECK( size > 0 );

View File

@ -424,20 +424,6 @@ extern bool IsRunningUnderXVFB()
return s_isRunningUnderXVFB == 1;
}
#ifdef __LINUX__
extern bool IsRunningInLXC()
{
// We're supposed to be able to detect running in LXC by checking for
// /dev/lxd existency, but this doesn't work under Travis for some reason,
// so just rely on having the environment variable defined for the
// corresponding builds in our .travis.yml.
wxString value;
return wxGetEnv("wxLXC", &value) && value == "1";
}
#endif // __LINUX__
#if wxUSE_GUI
bool EnableUITests()

View File

@ -147,10 +147,6 @@ extern bool IsAutomaticTest();
extern bool IsRunningUnderXVFB();
#ifdef __LINUX__
extern bool IsRunningInLXC();
#endif // __LINUX__
// Helper class setting the locale to the given one for its lifetime.
class LocaleSetter
{

View File

@ -341,11 +341,6 @@ 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;