aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-05-05 14:20:37 +0200
committerUlf Hermann <ulf.hermann@qt.io>2017-05-08 09:49:18 +0000
commit5346da3f11f52530ef3c14d4ff16124b86f922e1 (patch)
treeb4f0e9281787afe6bef9da30dd9503e62938b41e
parent9abcbbd3ab68da3cf7ee977c82b860e2ac42bb2c (diff)
Remove the qqmldebugtrace benchmark
It benchmarks QElapsedTimer and QDataStream. We should do this in qtbase if we need to do it. The test was not in the parent qml.pro, but it was mentioned in some outdated comments in the QML profiler plugins. Remove those comments, too. Change-Id: I0d1341c32f4a2e02a04a958f76be015fe8d927fb Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp2
-rw-r--r--tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro8
-rw-r--r--tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp87
4 files changed, 0 insertions, 99 deletions
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index 90e817e2fc..510c745d4e 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -66,8 +66,6 @@ QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEngin
}
// convert to QByteArrays that can be sent to the debug client
-// use of QDataStream can skew results
-// (see tst_qqmldebugtrace::trace() benchmark)
static void qQmlProfilerDataToByteArrays(const QQmlProfilerData &d,
QQmlProfiler::LocationHash &locations,
QList<QByteArray> &messages,
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
index 0c9fc36463..35beb0ee0d 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
@@ -74,8 +74,6 @@ QQuickProfilerAdapter::~QQuickProfilerAdapter()
}
// convert to QByteArrays that can be sent to the debug client
-// use of QDataStream can skew results
-// (see tst_qqmldebugtrace::trace() benchmark)
static void qQuickProfilerDataToByteArrays(const QQuickProfilerData &data,
QList<QByteArray> &messages)
{
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"