From 5bc49483c6b76e928daa0f824785f8cb8d9ae159 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Wed, 26 Oct 2011 11:29:58 +0200 Subject: 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 Reviewed-by: Shane Kearns (cherry picked from commit b5ef53df457d784da7221a8244963462a686458d) --- tests/auto/qfile/largefile/largefile.pro | 1 - tests/auto/qfile/largefile/tst_largefile.cpp | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/qfile/largefile/largefile.pro b/tests/auto/qfile/largefile/largefile.pro index ea305ec..6407cb6 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 92d3070..2897ad6 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); -- cgit v0.12