AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test: remove QSKIP from tst_QDateTime::fromString_LOCALE_ILDATE

Browse Source 
Instead omit the whole test when Q_OS_WIN is not defined.

Change-Id: I311538ce839353d4d5e83edfd12c68968fe61215
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Caroline Chao 2012-10-18 15:01:39 +02:00 committed by The Qt Project
parent 9fa2e5a14d
commit f7f9a28a26
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -117,7 +117,9 @@ private slots:
void fromStringDateFormat();
void fromStringStringFormat_data();
void fromStringStringFormat();
#ifdef Q_OS_WIN
void fromString_LOCALE_ILDATE();
#endif
void fromStringToStringLocale_data();
void fromStringToStringLocale();
@ -1543,19 +1545,18 @@ void tst_QDateTime::fromStringStringFormat()
QCOMPARE(dt, expected);
}
#ifdef Q_OS_WIN
// Windows only
void tst_QDateTime::fromString_LOCALE_ILDATE()
{
#ifdef Q_OS_WIN
QString date1 = QLatin1String("Sun 1. Dec 13:02:00 1974");
QString date2 = QLatin1String("Sun Dec 1 13:02:00 1974");
QDateTime ref(QDate(1974, 12, 1), QTime(13, 2));
QCOMPARE(ref, QDateTime::fromString(date2, Qt::TextDate));
QCOMPARE(ref, QDateTime::fromString(date1, Qt::TextDate));
#else
QSKIP("Windows only");
#endif
}
#endif
void tst_QDateTime::fromStringToStringLocale_data()
{