diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-04-04 16:47:17 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-04-06 12:19:55 +0000 |
| commit | 60f6e4428fd8ec1cc2fd619b20d94a08e953af46 (patch) | |
| tree | 2ed82d54e571aeb96b668944b6b633db8ce726af /tests | |
| parent | 42b3ed763f989da94a776fd39f9726d2effc5cb1 (diff) | |
Fix tst_QFile for qemu
Qemu does not report /proc/self/maps size correctly. Added expected
failure for it
Change-Id: I4019884702b8f9a33717b02e79c9e0c042b2449f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/io/qfile/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfile/tst_qfile.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro index 5f1963cf5f..7ad047e8a2 100644 --- a/tests/auto/corelib/io/qfile/test/test.pro +++ b/tests/auto/corelib/io/qfile/test/test.pro @@ -6,6 +6,8 @@ else: DEFINES += QT_NO_NETWORK TARGET = ../tst_qfile SOURCES = ../tst_qfile.cpp +INCLUDEPATH += ../../../../../shared/ +HEADERS += ../../../../../shared/emulationdetector.h RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index a23ebc8d72..81c11ef085 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -41,6 +41,8 @@ #include <private/qfsfileengine_p.h> #include <private/qfilesystemengine_p.h> +#include "emulationdetector.h" + #ifdef Q_OS_WIN QT_BEGIN_NAMESPACE extern Q_CORE_EXPORT int qt_ntfs_permission_lookup; @@ -2393,7 +2395,11 @@ void tst_QFile::virtualFile() // open the file QFile f(fname); QVERIFY2(f.open(QIODevice::ReadOnly), msgOpenFailed(f).constData()); + if (EmulationDetector::isRunningArmOnX86()) + QEXPECT_FAIL("","QEMU does not read /proc/self/maps size correctly", Continue); QCOMPARE(f.size(), Q_INT64_C(0)); + if (EmulationDetector::isRunningArmOnX86()) + QEXPECT_FAIL("","QEMU does not read /proc/self/maps size correctly", Continue); QVERIFY(f.atEnd()); // read data |