diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-09-14 18:14:14 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-17 15:00:39 (GMT) |
| commit | 7816018e6c2473c7d2d5ebd39bb62733923768f8 (patch) | |
| tree | f11e72b38f3bb10f513f49bbded38904b16ab966 | |
| parent | 25213a335e7e66db6923a4849e7f83cdbd87783f (diff) | |
| download | Qt-7816018e6c2473c7d2d5ebd39bb62733923768f8.zip Qt-7816018e6c2473c7d2d5ebd39bb62733923768f8.tar.gz Qt-7816018e6c2473c7d2d5ebd39bb62733923768f8.tar.bz2 | |
Blackberry: fix tst_QFileInfo::fileTimes()
The Blackberry OS uses a filesystem with the noatime option,
which returns a "wrong" access time.
cherry-picked from qt5 31f94e028527ffa02b954a3a91eabe80e2926838
Change-Id: Ic37d19b62ffbed6f67dbbbdf76bb4202bb0472e5
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| -rw-r--r-- | tests/auto/qfileinfo/tst_qfileinfo.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 0b782eb..d0bd66f 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -1104,11 +1104,14 @@ void tst_QFileInfo::fileTimes() RegCloseKey(key); } #endif -#ifdef Q_OS_WINCE +#if defined(Q_OS_WINCE) QEXPECT_FAIL("simple", "WinCE only stores date of access data, not the time", Continue); -#endif -#ifdef Q_OS_SYMBIAN - QEXPECT_FAIL("simple", "Symbian implementation of stat doesn't return read time right", Abort); +#elif defined(Q_OS_SYMBIAN) + QEXPECT_FAIL("simple", "Symbian implementation of stat doesn't return read time right", Abort); +#elif defined(Q_OS_BLACKBERRY) + QEXPECT_FAIL("simple", "Blackberry OS uses the noatime filesystem option", Continue); + QEXPECT_FAIL("longfile", "Blackberry OS uses the noatime filesystem option", Continue); + QEXPECT_FAIL("longfile absolutepath", "Blackberry OS uses the noatime filesystem option", Continue); #endif QVERIFY(fileInfo.lastRead() > beforeRead); QVERIFY(fileInfo.lastModified() > beforeWrite); |