diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-26 11:49:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 06:12:09 +0200 |
| commit | 238c3046134cf184c642d75e69fc2fb85a29e057 (patch) | |
| tree | 257b45b31cc5716f98074b70a660c2f655332345 /tests/auto/corelib | |
| parent | eeaf05155804dccfcd32adf78ccdf129b99c7708 (diff) | |
Remove obsolete MSVC workarounds from autotests.
Qt5 doesn't support MSVC versions before 2008, so workarounds for
earlier versions are no longer required.
Change-Id: I429feff99fe61d286637b960d92fd58962f8aefa
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfile/tst_qfile.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp | 19 |
3 files changed, 0 insertions, 27 deletions
diff --git a/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp b/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp index 5e5be42bdf..1ac878d81b 100644 --- a/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp +++ b/tests/auto/corelib/io/qfile/largefile/tst_largefile.cpp @@ -436,11 +436,6 @@ void tst_LargeFile::streamPositioning() { QFETCH( qint64, position ); -#if defined(QT_LARGEFILE_SUPPORT) && defined(Q_CC_MSVC) && _MSC_VER < 1400 - if (position >= (qint64)1 << 31) - QSKIP("MSVC 2003 doesn't have 64 bit versions of fseek/ftell."); -#endif - stream_ = QT_FOPEN("qt_largefile.tmp", "rb"); QVERIFY( 0 != stream_ ); diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 803b45c3b8..0501ff5a44 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -1468,9 +1468,6 @@ void tst_QFile::largeUncFileSupport() } { // 2) stdlib file handling. -#if _MSC_VER <= 1310 - QSKIP("platform SDK for MSVC 2003 does not support large files"); -#endif QFile file; FILE *fh = fopen(QFile::encodeName(largeFile).data(), "rb"); QVERIFY(file.open(fh, QIODevice::ReadOnly)); diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index 7d7a81232c..d81656325c 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -850,14 +850,7 @@ void tst_QSharedPointer::differentPointers() QVERIFY(baseptr.data() == aData); QVERIFY(aData == baseptr.data()); - -#if defined(Q_CC_MSVC) && _MSC_VER < 1400 - QEXPECT_FAIL("", "Compiler bug", Continue); -#endif QVERIFY(baseptr == aData); -#if defined(Q_CC_MSVC) && _MSC_VER < 1400 - QEXPECT_FAIL("", "Compiler bug", Continue); -#endif QVERIFY(aData == baseptr); } check(); @@ -873,9 +866,6 @@ void tst_QSharedPointer::differentPointers() QVERIFY(ptr == baseptr); QVERIFY(ptr.data() == baseptr.data()); QVERIFY(ptr == aBase); -#if defined(Q_CC_MSVC) && _MSC_VER < 1400 - QEXPECT_FAIL("", "Compiler bug", Continue); -#endif QVERIFY(baseptr == aData); } check(); @@ -892,9 +882,6 @@ void tst_QSharedPointer::differentPointers() QVERIFY(ptr.data() == baseptr.data()); QVERIFY(ptr == aBase); QVERIFY(ptr == aData); -#if defined(Q_CC_MSVC) && _MSC_VER < 1400 - QEXPECT_FAIL("", "Compiler bug", Continue); -#endif QVERIFY(baseptr == aData); QVERIFY(baseptr == aBase); } @@ -915,9 +902,6 @@ void tst_QSharedPointer::virtualBaseDifferentPointers() QVERIFY(ptr.data() == baseptr.data()); QVERIFY(ptr == aBase); QVERIFY(ptr == aData); -#if defined(Q_CC_MSVC) && _MSC_VER < 1400 - QEXPECT_FAIL("", "Compiler bug", Continue); -#endif QVERIFY(baseptr == aData); QVERIFY(baseptr == aBase); } @@ -935,9 +919,6 @@ void tst_QSharedPointer::virtualBaseDifferentPointers() QVERIFY(ptr.data() == baseptr.data()); QVERIFY(ptr == aBase); QVERIFY(ptr == aData); -#if defined(Q_CC_MSVC) && _MSC_VER < 1400 - QEXPECT_FAIL("", "Compiler bug", Continue); -#endif QVERIFY(baseptr == aData); QVERIFY(baseptr == aBase); } |