From b2b1b21bf2f177de04d5eefb0d1f111e1eaa259e Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 7 Apr 2020 01:48:38 +0200 Subject: [PATCH] Fix tests when run on ppc64le arch Don't assume that files in /sys are 4KiB in size, their actual size is equal to the kernel page size which varies depending on the architecture and kernel build options. --- tests/file/filetest.cpp | 2 +- tests/filename/filenametest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp index f1876daf94..9692bd3c60 100644 --- a/tests/file/filetest.cpp +++ b/tests/file/filetest.cpp @@ -159,7 +159,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]") // All files in /sys seem to have size of 4KiB currently, even if they // don't have that much data in them. wxFile fileSys("/sys/power/state"); - CHECK( fileSys.Length() == 4096 ); + CHECK( fileSys.Length() == sysconf(_SC_PAGESIZE) ); CHECK( fileSys.IsOpened() ); CHECK( fileSys.ReadAll(&s) ); CHECK( !s.empty() ); diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 240e95205c..2928b8d4cb 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -1060,7 +1060,7 @@ TEST_CASE("wxFileName::GetSizeSpecial", "[filename][linux][special-file]") CHECK( size > 0 ); // All files in /sys seem to have size of 4KiB currently. - CHECK( wxFileName::GetSize("/sys/power/state") == 4096 ); + CHECK( wxFileName::GetSize("/sys/power/state") == sysconf(_SC_PAGESIZE) ); } #endif // __LINUX__