AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tst_QFile for qemu

Browse Source 
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>
This commit is contained in:
Sami Nurmenniemi 2017-04-04 16:47:17 +03:00
parent 42b3ed763f
commit 60f6e4428f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qfile/test/test.pro
View File

@ -6,6 +6,8 @@ else: DEFINES += QT_NO_NETWORK
TARGET = ../tst_qfile TARGET = ../tst_qfile
SOURCES = ../tst_qfile.cpp SOURCES = ../tst_qfile.cpp
INCLUDEPATH += ../../../../../shared/
HEADERS += ../../../../../shared/emulationdetector.h
RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc

6
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -41,6 +41,8 @@
#include <private/qfsfileengine_p.h> #include <private/qfsfileengine_p.h>
#include <private/qfilesystemengine_p.h> #include <private/qfilesystemengine_p.h>
#include "emulationdetector.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
extern Q_CORE_EXPORT int qt_ntfs_permission_lookup; extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
@ -2393,7 +2395,11 @@ void tst_QFile::virtualFile()
// open the file // open the file
QFile f(fname); QFile f(fname);
QVERIFY2(f.open(QIODevice::ReadOnly), msgOpenFailed(f).constData()); 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)); 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()); QVERIFY(f.atEnd());
// read data // read data