summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-27 14:46:43 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 01:04:22 +0200
commit11d1068aa72df599ce2d44e607456b089ec2b84d (patch)
treea52d7396d9c4c7394440c7b8bbc87b69acdfb52d
parentabe229291b292e1e5d0d07b23c130991b347ae78 (diff)
downloadqtscript-11d1068aa72df599ce2d44e607456b089ec2b84d.tar.gz
Revert "Skip failing qscriptengine tests on Windows."
This reverts commit eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918. That commit disabled a test that had a legitimate failure, caused by a QDateTime regression. Said regression was fixed by qtbase commit 475cbed2446d0e3595e7b8ab71dcbc1ae5f59bcf. Change-Id: I1212dc8414d5a0d8d87bbe2e2a667475fd30414c Reviewed-by: John Layt <jlayt@kde.org>
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 82d7f05..c75f652 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -5809,9 +5809,6 @@ void tst_QScriptEngine::qRegExpInport()
// effect at a given date (QTBUG-9770).
void tst_QScriptEngine::dateRoundtripJSQtJS()
{
-#ifdef Q_OS_WIN
- QSKIP("This test fails on Windows due to a bug in QDateTime.");
-#endif
uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
QScriptEngine eng;
for (int i = 0; i < 8000; ++i) {
@@ -5839,9 +5836,6 @@ void tst_QScriptEngine::dateRoundtripQtJSQt()
void tst_QScriptEngine::dateConversionJSQt()
{
-#ifdef Q_OS_WIN
- QSKIP("This test fails on Windows due to a bug in QDateTime.");
-#endif
uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
QScriptEngine eng;
for (int i = 0; i < 8000; ++i) {