diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-10-26 11:29:58 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-14 07:58:07 +0100 |
| commit | 5bc49483c6b76e928daa0f824785f8cb8d9ae159 (patch) | |
| tree | b3fef614fa765da00150f535278ee0ab6cf0cb6e | |
| parent | 2d17086e3790953bb5a65e32c5e7ca5306ff67ea (diff) | |
Re-enabled tst_LargeFile
tst_LargeFile currently seems to pass in a stable way in CI
It does have an issue on 64-bit Linux (see QTBUG-21175), so
that test function is still disabled (QEXPECT_FAIL'ed) on that platform.
Change-Id: I818046f84f2db5eb2155ae1f51f69581029bfaee
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit b5ef53df457d784da7221a8244963462a686458d)
| -rw-r--r-- | tests/auto/qfile/largefile/largefile.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qfile/largefile/tst_largefile.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qfile/largefile/largefile.pro b/tests/auto/qfile/largefile/largefile.pro index ea305ec70c..6407cb6b3e 100644 --- a/tests/auto/qfile/largefile/largefile.pro +++ b/tests/auto/qfile/largefile/largefile.pro @@ -6,4 +6,3 @@ SOURCES += tst_largefile.cpp wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp CONFIG += parallel_test -CONFIG += insignificant_test diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp index 92d307058d..2897ad6aa1 100644 --- a/tests/auto/qfile/largefile/tst_largefile.cpp +++ b/tests/auto/qfile/largefile/tst_largefile.cpp @@ -526,6 +526,9 @@ void tst_LargeFile::mapOffsetOverflow() uchar *address = 0; address = largeFile.map(((qint64)1 << i), blockSize); +#if defined(__x86_64__) + QEXPECT_FAIL("", "fails on 64-bit Linux (QTBUG-21175)", Abort); +#endif QVERIFY( !address ); address = largeFile.map(((qint64)1 << i) + blockSize, blockSize); |