aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/particles/affectors/affectors.pro8
-rw-r--r--tests/benchmarks/particles/affectors/tst_affectors.cpp9
-rw-r--r--tests/benchmarks/particles/emission/emission.pro3
-rw-r--r--tests/benchmarks/qml/animation/tst_animation.cpp5
-rw-r--r--tests/benchmarks/qml/js/qjsengine/qjsengine.pro2
-rw-r--r--tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp2
-rw-r--r--tests/benchmarks/qml/qml.pro2
-rw-r--r--tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro8
-rw-r--r--tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp87
-rw-r--r--tests/benchmarks/qml/script/tst_script.cpp89
10 files changed, 23 insertions, 192 deletions
diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro
index 3351228a4b..35e1f514cc 100644
--- a/tests/benchmarks/particles/affectors/affectors.pro
+++ b/tests/benchmarks/particles/affectors/affectors.pro
@@ -1,10 +1,10 @@
-CONFIG += benchmark
+# This benchmark is broken, see QTBUG-60621
+#CONFIG += benchmark
+TEMPLATE = app
TARGET = tst_affectors
SOURCES += tst_affectors.cpp
macx:CONFIG -= app_bundle
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
+DEFINES += SRCDIR=\\\"$$PWD\\\"
QT += quickparticles-private testlib
diff --git a/tests/benchmarks/particles/affectors/tst_affectors.cpp b/tests/benchmarks/particles/affectors/tst_affectors.cpp
index 99d175564b..4c611c6faa 100644
--- a/tests/benchmarks/particles/affectors/tst_affectors.cpp
+++ b/tests/benchmarks/particles/affectors/tst_affectors.cpp
@@ -48,6 +48,11 @@ tst_affectors::tst_affectors()
{
}
+inline QUrl TEST_FILE(const QString &filename)
+{
+ return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
void tst_affectors::test_basic_data()
{
QTest::addColumn<int> ("dt");
@@ -69,7 +74,7 @@ void tst_affectors::test_filtered_data()
void tst_affectors::test_basic()
{
QFETCH(int, dt);
- QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml");
+ QQuickView* view = createView(TEST_FILE("basic.qml"));
QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
//Pretend we're running, but we manually advance the simulation
system->m_running = true;
@@ -109,7 +114,7 @@ void tst_affectors::test_basic()
void tst_affectors::test_filtered()
{
QFETCH(int, dt);
- QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/filtered.qml");
+ QQuickView* view = createView(TEST_FILE("filtered.qml"));
QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
//Pretend we're running, but we manually advance the simulation
system->m_running = true;
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
index f6730e60ff..963346ebdd 100644
--- a/tests/benchmarks/particles/emission/emission.pro
+++ b/tests/benchmarks/particles/emission/emission.pro
@@ -1,4 +1,5 @@
-CONFIG += benchmark
+# This benchmark is broken, see QTBUG-60621
+#CONFIG += benchmark
TARGET = tst_emission
SOURCES += tst_emission.cpp
macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/animation/tst_animation.cpp b/tests/benchmarks/qml/animation/tst_animation.cpp
index 59f5a57f5c..27622ed013 100644
--- a/tests/benchmarks/qml/animation/tst_animation.cpp
+++ b/tests/benchmarks/qml/animation/tst_animation.cpp
@@ -41,8 +41,11 @@ public:
private slots:
void abstractAnimation();
+
+#if defined(QT_BUILD_INTERNAL)
void bulkValueAnimator();
void propertyUpdater();
+#endif
void animationtree_qml();
@@ -75,6 +78,7 @@ void tst_animation::abstractAnimation()
}
}
+#if defined(QT_BUILD_INTERNAL)
void tst_animation::bulkValueAnimator()
{
QBENCHMARK {
@@ -90,6 +94,7 @@ void tst_animation::propertyUpdater()
delete updater;
}
}
+#endif // QT_BUILD_INTERNAL
void tst_animation::animationtree_qml()
{
diff --git a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
index e49a48f779..c4aba78756 100644
--- a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
+++ b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
@@ -1,6 +1,8 @@
+CONFIG += benchmark
TEMPLATE = app
TARGET = tst_bench_qjsengine
SOURCES += tst_qjsengine.cpp
QT += qml testlib
+macos:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index 9da310d976..d13751385c 100644
--- a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -324,7 +324,7 @@ void tst_QJSEngine::newQObject()
{
newEngine();
QBENCHMARK {
- (void)m_engine->newQObject(QCoreApplication::instance());
+ (void)m_engine->newQObject(new QObject);
}
}
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index f1fe87e532..437d13c87e 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -9,7 +9,7 @@ SUBDIRS += \
qqmlcomponent \
qqmlmetaproperty \
librarymetrics_performance \
-# script \ ### FIXME: doesn't build
+ script \
js \
creation
diff --git a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
deleted file mode 100644
index 556842af80..0000000000
--- a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += benchmark
-QT += qml testlib
-TEMPLATE = app
-TARGET = tst_qqmldebugtrace
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qqmldebugtrace.cpp
-
diff --git a/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp b/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp
deleted file mode 100644
index 68b34deb3a..0000000000
--- a/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp
+++ /dev/null
@@ -1,87 +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 <QtCore/QElapsedTimer>
-#include <QObject>
-#include <qtest.h>
-
-class tst_qqmldebugtrace : public QObject
-{
- Q_OBJECT
-
-public:
- tst_qqmldebugtrace() {}
-
-private slots:
- void all();
- void startElapsed();
- void doubleElapsed();
- void trace();
-};
-
-void tst_qqmldebugtrace::all()
-{
- QBENCHMARK {
- QElapsedTimer t;
- t.start();
- t.nsecsElapsed();
- }
-}
-
-void tst_qqmldebugtrace::startElapsed()
-{
- QElapsedTimer t;
- QBENCHMARK {
- t.start();
- t.nsecsElapsed();
- }
-}
-
-void tst_qqmldebugtrace::doubleElapsed()
-{
- QElapsedTimer t;
- t.start();
- QBENCHMARK {
- t.nsecsElapsed();
- t.nsecsElapsed();
- }
-}
-
-void tst_qqmldebugtrace::trace()
-{
- QString s("A decent sized string of text here.");
- QBENCHMARK {
- QByteArray data;
- QDataStream ds(&data, QIODevice::WriteOnly);
- ds << (qint64)100 << (int)5 << (int)5 << s;
- }
-}
-
-QTEST_MAIN(tst_qqmldebugtrace)
-
-#include "tst_qqmldebugtrace.moc"
diff --git a/tests/benchmarks/qml/script/tst_script.cpp b/tests/benchmarks/qml/script/tst_script.cpp
index 3829f3df6a..a48d6bdec7 100644
--- a/tests/benchmarks/qml/script/tst_script.cpp
+++ b/tests/benchmarks/qml/script/tst_script.cpp
@@ -52,10 +52,8 @@ private slots:
void property_getter_qmetaproperty();
#endif
void property_qobject();
- void property_qmlobject();
void setproperty_js();
- void setproperty_qmlobject();
void function_js();
#if 0
@@ -63,7 +61,6 @@ private slots:
void function_cpp();
#endif
void function_qobject();
- void function_qmlobject();
void function_args_js();
#if 0
@@ -71,7 +68,6 @@ private slots:
void function_args_cpp();
#endif
void function_args_qobject();
- void function_args_qmlobject();
void signal_unconnected();
void signal_qml();
@@ -178,7 +174,7 @@ void tst_script::property_js()
}
}
-#if 0
+#if 0 // This requires internal API access in V4
static QJSValue property_getter_method(QScriptContext *, QJSEngine *engine)
{
static int x = 0;
@@ -305,26 +301,6 @@ void tst_script::property_qobject()
}
}
-void tst_script::property_qmlobject()
-{
- QQmlEngine qmlengine;
-
- TestObject to;
- QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
- v8::HandleScope handle_scope;
- v8::Context::Scope scope(engine->context());
- QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
- QJSValueList args;
- args << v;
- QJSValue prog = qmlengine.evaluate(PROPERTY_PROGRAM).call(args);
- prog.call();
-
- QBENCHMARK {
- prog.call();
- }
-}
-
#define SETPROPERTY_PROGRAM \
"(function(testObject) { return (function() { " \
" for (var ii = 0; ii < 10000; ++ii) { " \
@@ -349,27 +325,6 @@ void tst_script::setproperty_js()
}
}
-void tst_script::setproperty_qmlobject()
-{
- QQmlEngine qmlengine;
-
- TestObject to;
-
- QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
- v8::HandleScope handle_scope;
- v8::Context::Scope scope(engine->context());
- QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
- QJSValueList args;
- args << v;
- QJSValue prog = qmlengine.evaluate(SETPROPERTY_PROGRAM).call(args);
- prog.call();
-
- QBENCHMARK {
- prog.call();
- }
-}
-
#define FUNCTION_PROGRAM \
"(function(testObject) { return (function() { " \
" var test = 0; " \
@@ -437,27 +392,6 @@ void tst_script::function_qobject()
}
}
-void tst_script::function_qmlobject()
-{
- QQmlEngine qmlengine;
-
- TestObject to;
-
- QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
- v8::HandleScope handle_scope;
- v8::Context::Scope scope(engine->context());
- QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
- QJSValueList args;
- args << v;
- QJSValue prog = qmlengine.evaluate(FUNCTION_PROGRAM).call(args);
- prog.call();
-
- QBENCHMARK {
- prog.call();
- }
-}
-
#define FUNCTION_ARGS_PROGRAM \
"(function(testObject) { return (function() { " \
" var test = 0; " \
@@ -525,27 +459,6 @@ void tst_script::function_args_qobject()
}
}
-void tst_script::function_args_qmlobject()
-{
- QQmlEngine qmlengine;
-
- TestObject to;
-
- QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
- v8::HandleScope handle_scope;
- v8::Context::Scope scope(engine->context());
- QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
- QJSValueList args;
- args << v;
- QJSValue prog = qmlengine.evaluate(FUNCTION_ARGS_PROGRAM).call(args);
- prog.call();
-
- QBENCHMARK {
- prog.call();
- }
-}
-
void tst_script::signal_unconnected()
{
QQmlEngine engine;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:34:28 +0000