diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-09-30 18:19:36 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-05 06:33:53 +0000 |
commit | cd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (patch) | |
tree | 71c198ed938cc018128e6f3eaea3fc25105d1827 /tests/auto/corelib | |
parent | 5418c8764f3d1b30a72951b29beaa9cf408d1ee9 (diff) |
Remove references to obsolete platforms
ultrix and reliant have not seen a release since 1995. dgux not since
2001. bsdi not since 2003. irix not since 2006. osf not since 2010.
dynix... unclear, but no later than 2002. symbian needs no mention.
All considered obsolete, all gone.
sco and unixware are effectively obsolete. Remove them until someone
expresses a real need.
Change-Id: Ia3d9d370016adce9213ae5ad0ef965ef8de2a3ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib')
5 files changed, 0 insertions, 44 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 7bf45be58c..372bca6ffd 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -68,8 +68,6 @@ QT_END_NAMESPACE #elif defined(Q_OS_FREEBSD) # include <sys/param.h> # include <sys/mount.h> -#elif defined(Q_OS_IRIX) -# include <sys/statfs.h> #elif defined(Q_OS_VXWORKS) # include <fcntl.h> #if defined(_WRS_KERNEL) @@ -1905,10 +1903,6 @@ void tst_QFile::largeFileSupport() if (::GetDiskFreeSpaceEx((wchar_t*)QDir::currentPath().utf16(), &free, 0, 0)) freespace = free.QuadPart; if (freespace != 0) { -#elif defined(Q_OS_IRIX) - struct statfs info; - if (statfs(QDir::currentPath().local8Bit(), &info, sizeof(struct statfs), 0) == 0) { - freespace = qlonglong(info.f_bfree * info.f_bsize); #else struct statfs info; if (statfs(const_cast<char *>(QDir::currentPath().toLocal8Bit().constData()), &info) == 0) { diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index b0dd7f18f1..8333809c40 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -1873,9 +1873,6 @@ void tst_QSortFilterProxyModel::changeFilter() QCOMPARE(args.at(2).toInt(), finalRemoveIntervals.at(i).second); } -#ifdef Q_OS_IRIX - QEXPECT_FAIL("filter (2)", "Not reliable on IRIX", Abort); -#endif QCOMPARE(finalInsertSpy.count(), insertIntervals.count()); for (int i = 0; i < finalInsertSpy.count(); ++i) { QList<QVariant> args = finalInsertSpy.at(i); diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index 93c10d78db..338adaabf7 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -756,13 +756,7 @@ void tst_QByteArray::qvsnprintf() QCOMPARE(static_cast<const char *>(buf), "bub****************"); # endif #else -#ifdef Q_OS_IRIX - // Irix reports back the amount of characters written without the \0 - QCOMPARE(::qsnprintf(buf, 3, "%s", "bubu"), 2); -#else - // Every other system in this world reports the amount of data that could have been written QCOMPARE(::qsnprintf(buf, 3, "%s", "bubu"), 4); -#endif QCOMPARE(static_cast<const char*>(buf), "bu"); #endif QCOMPARE(buf[4], char(42)); diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index c0ed88e154..7e1e2f1345 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -1263,9 +1263,6 @@ void tst_QDateTime::addSecs() QFETCH(QDateTime, dt); QFETCH(int, nsecs); QFETCH(QDateTime, result); -#ifdef Q_OS_IRIX - QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort); -#endif QDateTime test = dt.addSecs(nsecs); QCOMPARE(test, result); QCOMPARE(test.timeSpec(), dt.timeSpec()); @@ -1285,9 +1282,6 @@ void tst_QDateTime::addMSecs() QFETCH(int, nsecs); QFETCH(QDateTime, result); -#ifdef Q_OS_IRIX - QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort); -#endif QDateTime test = dt.addMSecs(qint64(nsecs) * 1000); QCOMPARE(test, result); QCOMPARE(test.timeSpec(), dt.timeSpec()); @@ -1373,9 +1367,6 @@ void tst_QDateTime::toTimeSpec() QCOMPARE(localToLocal.time(), fromLocal.time()); QCOMPARE(localToLocal.timeSpec(), Qt::LocalTime); -#ifdef Q_OS_IRIX - QEXPECT_FAIL("summer2", "IRIX databases say 1970 had DST", Abort); -#endif QCOMPARE(utcToLocal, fromLocal); QCOMPARE(utcToLocal.date(), fromLocal.date()); QCOMPARE(utcToLocal.time(), fromLocal.time()); @@ -1427,9 +1418,6 @@ void tst_QDateTime::toLocalTime() QFETCH(QDateTime, fromLocal); QCOMPARE(fromLocal.toLocalTime(), fromLocal); -#ifdef Q_OS_IRIX - QEXPECT_FAIL("summer2", "IRIX databases say 1970 had DST", Abort); -#endif QCOMPARE(fromUtc.toLocalTime(), fromLocal); QCOMPARE(fromUtc.toLocalTime(), fromLocal.toLocalTime()); } else { @@ -1449,9 +1437,6 @@ void tst_QDateTime::toUTC() QFETCH(QDateTime, fromLocal); QCOMPARE(fromUtc.toUTC(), fromUtc); -#ifdef Q_OS_IRIX - QEXPECT_FAIL("summer2", "IRIX databases say 1970 had DST", Abort); -#endif QCOMPARE(fromLocal.toUTC(), fromUtc); QCOMPARE(fromUtc.toUTC(), fromLocal.toUTC()); } else { @@ -1512,9 +1497,6 @@ void tst_QDateTime::secsTo() QFETCH(QDateTime, result); if (dt.isValid()) { - #ifdef Q_OS_IRIX - QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort); - #endif QCOMPARE(dt.secsTo(result), (qint64)nsecs); QCOMPARE(result.secsTo(dt), (qint64)-nsecs); QVERIFY((dt == result) == (0 == nsecs)); @@ -1541,9 +1523,6 @@ void tst_QDateTime::msecsTo() QFETCH(QDateTime, result); if (dt.isValid()) { - #ifdef Q_OS_IRIX - QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort); - #endif QCOMPARE(dt.msecsTo(result), qint64(nsecs) * 1000); QCOMPARE(result.msecsTo(dt), -qint64(nsecs) * 1000); QVERIFY((dt == result) == (0 == (qint64(nsecs) * 1000))); diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp index 473f563f9b..581e9152e6 100644 --- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp +++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp @@ -121,14 +121,6 @@ typedef QList<int> IntList; #if defined(Q_OS_SOLARIS) # include <ieeefp.h> #endif -#if defined(Q_OS_OSF) && (defined(__DECC) || defined(__DECCXX)) -# define INFINITY DBL_INFINITY -# define NAN DBL_QNAN -#endif -#if defined(Q_OS_IRIX) && defined(Q_CC_GNU) -# include <ieeefp.h> -# define isnan(d) isnand(d) -#endif enum { LittleEndian, |