Add benchmarks to the "make benchmark" targets that are known to work

The qjsengine benchmark is one exception that is omitted because it crashes currently.

Change-Id: Ic93344dc864d0d6427d85faa12a2753126be808e
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

24 files changed, 30 insertions, 27 deletions

diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
new file mode 100644
index 0000000000..c7e7c6829a
--- /dev/null
+++ b/tests/benchmarks/benchmarks.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = qml script
+contains(QT_CONFIG, private_tests) {
+    SUBDIRS += particles
+}
diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro
index 112c4ea3ec..eb6190a649 100644
--- a/tests/benchmarks/particles/affectors/affectors.pro
+++ b/tests/benchmarks/particles/affectors/affectors.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TARGET = tst_affectors
 SOURCES += tst_affectors.cpp
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
index 0ebd75b738..45a757e2be 100644
--- a/tests/benchmarks/particles/emission/emission.pro
+++ b/tests/benchmarks/particles/emission/emission.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TARGET = tst_emission
 SOURCES += tst_emission.cpp
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/animation/animation.pro b/tests/benchmarks/qml/animation/animation.pro
index e089884a7e..4b680ed8fd 100644
--- a/tests/benchmarks/qml/animation/animation.pro
+++ b/tests/benchmarks/qml/animation/animation.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_animation
 QT += qml testlib core-private gui-private qml-private quick-private
diff --git a/tests/benchmarks/qml/binding/binding.pro b/tests/benchmarks/qml/binding/binding.pro
index fc0f731da6..99c0e43ed9 100644
--- a/tests/benchmarks/qml/binding/binding.pro
+++ b/tests/benchmarks/qml/binding/binding.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_binding
 QT += qml testlib
diff --git a/tests/benchmarks/qml/compilation/compilation.pro b/tests/benchmarks/qml/compilation/compilation.pro
index a55864f696..855032d4e2 100644
--- a/tests/benchmarks/qml/compilation/compilation.pro
+++ b/tests/benchmarks/qml/compilation/compilation.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_compilation
 QT += qml qml-private testlib core-private
diff --git a/tests/benchmarks/qml/creation/creation.pro b/tests/benchmarks/qml/creation/creation.pro
index 0cfac64d5f..c6f0bf7e17 100644
--- a/tests/benchmarks/qml/creation/creation.pro
+++ b/tests/benchmarks/qml/creation/creation.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_creation
 QT += core-private gui-private qml-private quick-private widgets testlib
diff --git a/tests/benchmarks/qml/holistic/holistic.pro b/tests/benchmarks/qml/holistic/holistic.pro
index 8fd87c88bd..72ca376523 100644
--- a/tests/benchmarks/qml/holistic/holistic.pro
+++ b/tests/benchmarks/qml/holistic/holistic.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_holistic
 QT += qml network testlib
diff --git a/tests/benchmarks/qml/javascript/javascript.pro b/tests/benchmarks/qml/javascript/javascript.pro
index b8f23f47d5..0ac4983ce0 100644
--- a/tests/benchmarks/qml/javascript/javascript.pro
+++ b/tests/benchmarks/qml/javascript/javascript.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_javascript
 QT += qml testlib
diff --git a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
index f736e59222..e9be784769 100644
--- a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
+++ b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
@@ -1,4 +1,3 @@
-CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_bench_qjsengine
 
diff --git a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
index 7b8363b6c4..b86daf2afc 100644
--- a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsvalue
 
diff --git a/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro b/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
index 34ed9caa15..0eb1dbdc0c 100644
--- a/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/qjsvalueiterator.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsvalueiterator
 
diff --git a/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro b/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro
index 7cfa843a2f..3bedc0ea18 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro
+++ b/tests/benchmarks/qml/librarymetrics_performance/librarymetrics_performance.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_librarymetrics_performance
 
diff --git a/tests/benchmarks/qml/pointers/pointers.pro b/tests/benchmarks/qml/pointers/pointers.pro
index ccf85d659a..ee09010c49 100644
--- a/tests/benchmarks/qml/pointers/pointers.pro
+++ b/tests/benchmarks/qml/pointers/pointers.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 QT += core-private qml-private testlib
 TEMPLATE = app
 TARGET = tst_pointers
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index b80ead6072..53aa68dff3 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
            binding \
-           creation \
            compilation \
            javascript \
            holistic \
@@ -11,9 +10,9 @@ SUBDIRS += \
            qqmlimage \
            qqmlmetaproperty \
 #            script \ ### FIXME: doesn't build
-           js \
-           qquickwindow
+           js
 
-qtHaveModule(opengl): SUBDIRS += painting
+qtHaveModule(opengl): SUBDIRS += painting qquickwindow
+qtHaveModule(widgets): SUBDIRS += creation
 
 include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro b/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
index 12a53f5e20..87f4dccf5c 100644
--- a/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
+++ b/tests/benchmarks/qml/qqmlcomponent/qqmlcomponent.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_qqmlcomponent
 QT += qml testlib
diff --git a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
index 4cf6bbe4bc..06371dc1d3 100644
--- a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
+++ b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 QT += qml testlib
 TEMPLATE = app
 TARGET = tst_qqmldebugtrace
diff --git a/tests/benchmarks/qml/qqmlimage/qqmlimage.pro b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
index 6a94052898..dfe0027ab4 100644
--- a/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
+++ b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_qqmlimage
 QT += qml quick-private testlib
diff --git a/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
index ce66e1e51f..f69be1bb3b 100644
--- a/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
+++ b/tests/benchmarks/qml/qqmlmetaproperty/qqmlmetaproperty.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_qqmlmetaproperty
 QT += qml testlib
diff --git a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
index 0676405e23..9e79d4acf8 100644
--- a/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
+++ b/tests/benchmarks/qml/qquickwindow/qquickwindow.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TARGET = tst_qquickwindow
 SOURCES += tst_qquickwindow.cpp
 macx:CONFIG -= app_bundle
@@ -8,4 +8,4 @@ testDataFiles.path = .
 DEPLOYMENT += testDataFiles
 
 QT += core-private gui-private  qml-private quick-private opengl-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
\ No newline at end of file
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/script/script.pro b/tests/benchmarks/qml/script/script.pro
index 51a02e796d..c151cdc146 100644
--- a/tests/benchmarks/qml/script/script.pro
+++ b/tests/benchmarks/qml/script/script.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_script
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/typeimports/typeimports.pro b/tests/benchmarks/qml/typeimports/typeimports.pro
index b8db7bd134..dd6347e260 100644
--- a/tests/benchmarks/qml/typeimports/typeimports.pro
+++ b/tests/benchmarks/qml/typeimports/typeimports.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_typeimports
 QT += qml testlib
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
index b0134b085a..166c774f71 100644
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsvalue
 INCLUDEPATH += .
diff --git a/tests/tests.pro b/tests/tests.pro
index 85e4f3a53d..f5731b2f34 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  auto
+SUBDIRS +=  auto benchmarks