aboutsummaryrefslogtreecommitdiffstats
path: root/tests/benchmarks
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@jollamobile.com>2014-08-11 12:13:46 +0200
committerRobin Burchell <robin.burchell@viroteck.net>2014-08-12 10:49:23 +0200
commit7f2f24c1362e3c71c2e076e8c28a86e0295741e6 (patch)
treec6429bd541707cef8870df337b0b0fae00270511 /tests/benchmarks
parent01c6af3fc940378e8eee41a9fb8273420ef5a7e1 (diff)
Fix compilation of tst_compilation (:-P) benchmark.
Change-Id: I7bbf24d816a356f100d7e2c5a8e7a81218f0f54d Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'tests/benchmarks')
-rw-r--r--tests/benchmarks/qml/compilation/tst_compilation.cpp31
-rw-r--r--tests/benchmarks/qml/qml.pro1
2 files changed, 1 insertions, 31 deletions
diff --git a/tests/benchmarks/qml/compilation/tst_compilation.cpp b/tests/benchmarks/qml/compilation/tst_compilation.cpp
index eac3dcc2dd..5c9017a3c8 100644
--- a/tests/benchmarks/qml/compilation/tst_compilation.cpp
+++ b/tests/benchmarks/qml/compilation/tst_compilation.cpp
@@ -47,7 +47,6 @@
#include <QtQml/private/qqmljsmemorypool_p.h>
#include <QtQml/private/qqmljsparser_p.h>
#include <QtQml/private/qqmljslexer_p.h>
-#include <QtQml/private/qqmlscript_p.h>
#include <QFile>
#include <QDebug>
@@ -65,9 +64,6 @@ private slots:
void jsparser_data();
void jsparser();
- void scriptparser_data();
- void scriptparser();
-
private:
QQmlEngine engine;
};
@@ -130,33 +126,6 @@ void tst_compilation::jsparser()
}
}
-void tst_compilation::scriptparser_data()
-{
- QTest::addColumn<QString>("file");
-
- QTest::newRow("boomblock") << QString(SRCDIR + QLatin1String("/data/BoomBlock.qml"));
-}
-
-void tst_compilation::scriptparser()
-{
- QFETCH(QString, file);
-
- QFile f(file);
- QVERIFY(f.open(QIODevice::ReadOnly));
- QByteArray data = f.readAll();
-
- //TODO(pvarga): check preparseData
- QByteArray preparseData;
- QUrl url = QUrl::fromLocalFile(file);
- QString urlString = url.toString();
-
- QBENCHMARK {
- QQmlScript::Parser parser;
- parser.parse(data, preparseData, url, urlString);
- parser.tree();
- }
-}
-
QTEST_MAIN(tst_compilation)
#include "tst_compilation.moc"
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index c50f57b655..3f2772c604 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -3,6 +3,7 @@ TEMPLATE = subdirs
SUBDIRS += \
binding \
creation \
+ compilation \
javascript \
holistic \
pointers \