summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-13 16:43:06 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-13 16:43:06 +0200
commit7a8cab928dd405973e102ad2e6703cdbbb6bd505 (patch)
treed090a99f81d9889dae9ef4984b438edc1d6767ec /tests
parentb4719a8cdeffc3991a63fed7df6489509173ebcd (diff)
parent1f8aa220b50eb83205279441769fa697730b3e6f (diff)
downloadqtscript-7a8cab928dd405973e102ad2e6703cdbbb6bd505.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia10bb1e8b5fa8bb93e76bf2e295df5c10336e582
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qscriptjstestsuite/expect_fail.txt6
-rw-r--r--tests/auto/qscriptv8testsuite/abstracttestsuite.cpp10
2 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/qscriptjstestsuite/expect_fail.txt b/tests/auto/qscriptjstestsuite/expect_fail.txt
index a611f8a..89aeee3 100644
--- a/tests/auto/qscriptjstestsuite/expect_fail.txt
+++ b/tests/auto/qscriptjstestsuite/expect_fail.txt
@@ -131,11 +131,15 @@ ecma_3/Unicode/uc-001.js | Unicode format-control character test (Category Cf.)
ecma_2/RegExp/exec-001.js | NO TESTS EXIST
ecma_2/String/replace-001.js | NO TESTS EXIST
-[Q_CC_MSVC]
+[Q_CC_MSVC32]
ecma_3/Expressions/11.7.3-01.js | 11.7.3 - >>> should evaluate operands in order: order | QTBUG-8056
ecma_3/Operators/order-01.js | operator evaluation order: 11.7.3 >>> | QTBUG-8056
ecma_3/Operators/order-01.js | operator evaluation order: 11.13.2 >>>= | QTBUG-8056
+[Q_CC_MSVC64]
+ecma/Expressions/11.4.7-02.js | -(-2147483648) == 2147483648 | QTBUG-32829
+ecma/TypeConversion/9.3.1-3.js | - -"0x80000000" | QTBUG-32829
+
[Q_CC_MINGW]
ecma/Math/15.8.2.5.js | Math.atan2(Infinity, Infinity)
ecma/Math/15.8.2.5.js | Math.atan2(Infinity, -Infinity)
diff --git a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp
index 8bb185f..b22a3c7 100644
--- a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp
@@ -42,6 +42,7 @@
#include "abstracttestsuite.h"
#include <QtTest/QtTest>
#include <QtCore/qset.h>
+#include <QtCore/QSysInfo>
#include <QtCore/qtextstream.h>
#include <private/qmetaobjectbuilder_p.h>
@@ -189,8 +190,14 @@ bool TestConfigParser::isKnownSymbol(const QString &symbol)
<< "Q_OS_MAC"
<< "Q_OS_WIN"
<< "Q_CC_MSVC"
+ << "Q_CC_MSVC32"
+ << "Q_CC_MSVC64"
<< "Q_CC_MINGW"
+ << "Q_CC_MINGW32"
+ << "Q_CC_MINGW64"
<< "Q_CC_INTEL"
+ << "Q_CC_INTEL32"
+ << "Q_CC_INTEL64"
;
}
return knownSymbols.contains(symbol);
@@ -220,12 +227,15 @@ bool TestConfigParser::isDefined(const QString &symbol)
#endif
#ifdef Q_CC_MSVC
<< "Q_CC_MSVC"
+ << (QStringLiteral("Q_CC_MSVC") + QString::number(QSysInfo::WordSize))
#endif
#ifdef Q_CC_MINGW
<< "Q_CC_MINGW"
+ << (QStringLiteral("Q_CC_MINGW") + QString::number(QSysInfo::WordSize))
#endif
#ifdef Q_CC_INTEL
<< "Q_CC_INTEL"
+ << (QStringLiteral("Q_CC_INTEL") + QString::number(QSysInfo::WordSize))
#endif
;
}