Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
  mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf
  mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
  mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
  configure: Deal with multiple redefinitions of qmake variables
  Split QScriptValue::call autotest into smaller tests.
  Optimize and clean up QClipData::fixup()
  There is no predefined qmake x11 scope for x11 builds.
  Refactor tst_QScriptContext::throwError test.
  Fixed whitespace.
  Don't use scopes in mkspecs as configure does not support them
  Fixed destination path for the S60 feedback plugin.
  Don't put Objective-C sources in SOURCES
  Fix regression in tst_maketestselftest::naming_convention.
  Split monolithic QScriptEngine autotests into smaller tests
  Add SunSpider and V8 benchmarks to benchmarks/script.pro
  Push and pop the thread-default context for the current thread
  Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.
  Import SunSpider benchmarks for QtScript
  Import V8 benchmarks for QtScript
  Add more microbenchmarks for QScriptValue
  ...

1 files changed, 129 insertions, 0 deletions

diff --git a/tests/benchmarks/script/sunspider/tst_sunspider.cpp b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
new file mode 100644
index 0000000..7a8617a
--- /dev/null
+++ b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalue.h>
+
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
+
+//TESTED_FILES=
+
+static QString readFile(const QString &filename)
+{
+    QFile file(filename);
+    if (!file.open(QFile::ReadOnly))
+        return QString();
+    QTextStream stream(&file);
+    stream.setCodec("UTF-8");
+    return stream.readAll();
+}
+
+class tst_SunSpider : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_SunSpider();
+    virtual ~tst_SunSpider();
+
+public slots:
+    void init();
+    void cleanup();
+
+private slots:
+    void benchmark_data();
+    void benchmark();
+
+private:
+    QDir testsDir;
+};
+
+tst_SunSpider::tst_SunSpider()
+{
+    testsDir = QDir(SRCDIR);
+    bool testsFound = testsDir.cd("tests");
+    if (!testsFound)
+        qWarning("*** no tests/ dir!");
+}
+
+tst_SunSpider::~tst_SunSpider()
+{
+}
+
+void tst_SunSpider::init()
+{
+}
+
+void tst_SunSpider::cleanup()
+{
+}
+
+void tst_SunSpider::benchmark_data()
+{
+    QTest::addColumn<QString>("testName");
+    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    foreach (QFileInfo tfi, testFileInfos) {
+        QString name = tfi.baseName();
+        QTest::newRow(name.toLatin1().constData()) << name;
+    }
+}
+
+void tst_SunSpider::benchmark()
+{
+    QFETCH(QString, testName);
+    QString testContents = readFile(testsDir.absoluteFilePath(testName + ".js"));
+    QVERIFY(!testContents.isEmpty());
+
+    QScriptEngine engine;
+    QBENCHMARK {
+        engine.evaluate(testContents);
+    }
+    QVERIFY(!engine.hasUncaughtException());
+}
+
+QTEST_MAIN(tst_SunSpider)
+#include "tst_sunspider.moc"