1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix qfile autotest build for WEC7

Browse Source 
Change-Id: I6c4b4c91ea841ccb91ad685510caaecaf51baced
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
This commit is contained in:
Janne Anttila 2012-06-19 11:11:13 +03:00 committed by Qt by Nokia
parent d8ad516150
commit d527f2b933
2 changed files with 5 additions and 3 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

@ -3,6 +3,8 @@ CONFIG += parallel_test
QT = core-private core network testlib
TARGET = ../tst_qfile
SOURCES = ../tst_qfile.cpp
wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc
TESTDATA += ../dosfile.txt ../noendofline.txt ../testfile.txt \

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

@ -3248,14 +3248,14 @@ void tst_QFile::autocloseHandle()
//file is not closed, read should succeed
char buf;
QCOMPARE((int)QT_READ(fd_, &buf, 1), 1);
::close(fd_);
QT_CLOSE(fd_);
fd_ = -1;
}
{
QFile file("readonlyfile");
QVERIFY(openFile(file, QIODevice::ReadOnly, OpenStream, QFile::AutoCloseHandle));
int fd = fileno(stream_);
int fd = QT_FILENO(stream_);
QCOMPARE(file.handle(), fd);
file.close();
stream_ = 0;
@ -3270,7 +3270,7 @@ void tst_QFile::autocloseHandle()
{
QFile file("readonlyfile");
QVERIFY(openFile(file, QIODevice::ReadOnly, OpenStream, QFile::DontCloseHandle));
QCOMPARE(file.handle(), fileno(stream_));
QCOMPARE(file.handle(), QT_FILENO(stream_));
file.close();
QCOMPARE(file.handle(), -1);
//file is not closed, read should succeed