diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-03-16 13:10:00 +0200 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-03-28 06:55:32 +0000 |
| commit | 514fff1e39d0bcab18de48658b87124205d9f625 (patch) | |
| tree | edd4a8ede06b8f13bbbbe5e3ff19b8f0650da544 /tests/auto/corelib/io/largefile | |
| parent | e6bf2376697975313b7ccd3f9bcebb869bb0b04c (diff) | |
Fix largefile tests on ARM and QEMU targets
- Test tst_LargeFile::mapFile fails on Qemu for files over 4Gb.
Fixed by limiting maxSizeBits to 28 (must be n*4 and < 32).
- Bug QTBUG-21175 is also effective on ARM targets. Fixed by
expecting failure also on ARM.
Change-Id: I9103727e618a17259b4785ec8c284f3bb60ebea7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/io/largefile')
| -rw-r--r-- | tests/auto/corelib/io/largefile/largefile.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/largefile/tst_largefile.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/largefile/largefile.pro b/tests/auto/corelib/io/largefile/largefile.pro index 6c1bb8d7ea..e96d1398ca 100644 --- a/tests/auto/corelib/io/largefile/largefile.pro +++ b/tests/auto/corelib/io/largefile/largefile.pro @@ -2,3 +2,5 @@ CONFIG += testcase TARGET = tst_largefile QT = core testlib SOURCES = tst_largefile.cpp +INCLUDEPATH += ../../../../shared/ +HEADERS += ../../../../shared/emulationdetector.h diff --git a/tests/auto/corelib/io/largefile/tst_largefile.cpp b/tests/auto/corelib/io/largefile/tst_largefile.cpp index a19a5ce58d..4e7877253f 100644 --- a/tests/auto/corelib/io/largefile/tst_largefile.cpp +++ b/tests/auto/corelib/io/largefile/tst_largefile.cpp @@ -47,6 +47,8 @@ # endif #endif // Q_OS_WIN +#include "emulationdetector.h" + class tst_LargeFile : public QObject { @@ -68,6 +70,10 @@ public: #else maxSizeBits = 24; // 16 MiB #endif + + // QEMU only supports < 4GB files + if (EmulationDetector::isRunningArmOnX86()) + maxSizeBits = qMin(maxSizeBits, 28); } private: |