aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-05-04 10:43:42 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-05-09 08:41:46 +0000
commitd6f57328136197b3b231225fd1a248a7703f102a (patch)
tree8f9a9c7d661820aefff90c8c7c4f6b4f37f52d7f
parentab92855a4f18d926706554186f80d4c15b65b319 (diff)
Remove outdated QJSValue benchmark
Now that the oterh QJSValue benchmark is fixed (yes, there were two benchmarks with the same name), this benchmark is superfluous. Change-Id: I39a7f9cc79dccef8aac3d4c3999a3d75e1b1aa3d Reviewed-by: Robin Burchell <robin.burchell@crimson.no> (cherry picked from commit 448104e4a09f66b62ff279d65ecc4658833e20f3)
-rw-r--r--tests/benchmarks/benchmarks.pro2
-rw-r--r--tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro1
-rw-r--r--tests/benchmarks/script/qjsvalue/qjsvalue.pro11
-rw-r--r--tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp104
-rw-r--r--tests/benchmarks/script/script.pro4
5 files changed, 2 insertions, 120 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index c7e7c6829a..ecfde6fcc2 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = qml script
+SUBDIRS = qml
contains(QT_CONFIG, private_tests) {
SUBDIRS += particles
}
diff --git a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
index b86daf2afc..99e245068e 100644
--- a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
@@ -6,3 +6,4 @@ SOURCES += tst_qjsvalue.cpp
QT += qml testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
deleted file mode 100644
index 166c774f71..0000000000
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG += benchmark
-TEMPLATE = app
-TARGET = tst_bench_qjsvalue
-INCLUDEPATH += .
-macx:CONFIG -= app_bundle
-CONFIG += release
-
-SOURCES += tst_qjsvalue.cpp
-
-QT += core-private qml-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp
deleted file mode 100644
index b5147dbf01..0000000000
--- a/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QJSEngine>
-#include <QJSValue>
-
-class tst_QJSValue : public QObject
-{
- Q_OBJECT
-public:
- tst_QJSValue() {}
-
-private slots:
- void fillArray();
-
- void property();
-
- void setProperty();
-
- void call();
-};
-
-void tst_QJSValue::fillArray()
-{
- QJSEngine eng;
- static const int ArrayLength = 10000;
- QJSValue array = eng.newArray(ArrayLength);
- QBENCHMARK {
- for (int i = 0; i < ArrayLength; ++i)
- array.setProperty(i, i);
- }
-}
-
-void tst_QJSValue::property()
-{
- QJSEngine eng;
- QJSValue object = eng.newObject();
- QString propertyName = QString::fromLatin1("foo");
- object.setProperty(propertyName, 123);
- QVERIFY(object.property(propertyName).isNumber());
- QBENCHMARK {
- object.property(propertyName);
- }
-}
-
-void tst_QJSValue::setProperty()
-{
- QJSEngine eng;
- QJSValue object = eng.newObject();
- QString propertyName = QString::fromLatin1("foo");
- QJSValue value(123);
- QBENCHMARK {
- object.setProperty(propertyName, value);
- }
-}
-
-#define TEST_FUNCTION_SOURCE "(function() { return 123; })"
-
-void tst_QJSValue::call()
-{
- QJSEngine eng;
- QJSValue fun = eng.evaluate(TEST_FUNCTION_SOURCE);
- QVERIFY(fun.isCallable());
- QJSValueList args;
- QVERIFY(fun.call(args).isNumber());
- QBENCHMARK {
- fun.call(args);
- }
-}
-
-QTEST_MAIN(tst_QJSValue)
-
-#include "tst_qjsvalue.moc"
diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
deleted file mode 100644
index 37dc03801d..0000000000
--- a/tests/benchmarks/script/script.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
- qjsvalue