aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-05-04 10:43:42 +0200
committerErik Verbruggen <erik.verbruggen@qt.io>2017-05-04 09:12:39 +0000
commit448104e4a09f66b62ff279d65ecc4658833e20f3 (patch)
treedb274181d3163c82e0165eb20f3b5d04a40ec40c
parent365d43a22050a4ea69e36b8d1033bf6ab3189264 (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>
-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.pro10
-rw-r--r--tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp99
-rw-r--r--tests/benchmarks/script/script.pro4
5 files changed, 2 insertions, 114 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 5e6bc65815..07a6d5ecaa 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = qml script
+SUBDIRS = qml
qtConfig(private_tests) {
qtConfig(opengl(es1|es2)?):SUBDIRS += particles
}
diff --git a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
index c646613799..edfb619608 100644
--- a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
@@ -5,3 +5,4 @@ TARGET = tst_bench_qjsvalue
SOURCES += tst_qjsvalue.cpp
QT += qml testlib
+macos:CONFIG -= app_bundle
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
deleted file mode 100644
index 1b39091dea..0000000000
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ /dev/null
@@ -1,10 +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
diff --git a/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp
deleted file mode 100644
index f1bdb78c7b..0000000000
--- a/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $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