From 1f8aa220b50eb83205279441769fa697730b3e6f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 11 Sep 2013 11:57:30 +0200
Subject: EXPECT_FAIL tests for MSVC 64 bit in qscriptjstestsuite.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce compiler defines for 32/64 bit and adapt the
text file.

Task-number: QTBUG-32829
Change-Id: I9cdbe5b306264858953e2c710b48300f5690e7db
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 tests/auto/qscriptv8testsuite/abstracttestsuite.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tests/auto/qscriptv8testsuite/abstracttestsuite.cpp')

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
             ;
     }
-- 
cgit v1.2.1