diff options
| -rw-r--r-- | tests/benchmarks/benchmarks.pro | 3 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/corelib.pro | 10 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/declarative.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/gui/gui.pro | 7 | ||||
| -rw-r--r-- | tests/benchmarks/network/network.pro | 7 | ||||
| -rw-r--r-- | tests/benchmarks/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/script/script.pro | 7 | ||||
| -rw-r--r-- | tests/benchmarks/svg/svg.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/trusted-benchmarks.pri | 8 |
9 files changed, 46 insertions, 2 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index 01d5cd5..00a1b37 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -7,3 +7,6 @@ SUBDIRS = \ svg contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, declarative): SUBDIRS += declarative + +check-trusted.CONFIG += recursive +QMAKE_EXTRA_TARGETS += check-trusted diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro index 8a6941b..335280e 100644 --- a/tests/benchmarks/corelib/corelib.pro +++ b/tests/benchmarks/corelib/corelib.pro @@ -4,5 +4,13 @@ SUBDIRS = \ kernel \ thread \ tools \ - codecs \ + codecs \ plugin + +TRUSTED_BENCHMARKS += \ + kernel/qmetaobject \ + kernel/qmetatype \ + kernel/qobject \ + thread/qthreadstorage + +include(../trusted-benchmarks.pri)
\ No newline at end of file diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro index 5dd31f3..cb02a35 100644 --- a/tests/benchmarks/declarative/declarative.pro +++ b/tests/benchmarks/declarative/declarative.pro @@ -12,4 +12,4 @@ SUBDIRS += \ contains(QT_CONFIG, opengl): SUBDIRS += painting - +include(../trusted-benchmarks.pri) diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro index 946f184..d825458 100644 --- a/tests/benchmarks/gui/gui.pro +++ b/tests/benchmarks/gui/gui.pro @@ -9,3 +9,10 @@ SUBDIRS = \ painting \ styles \ text + +TRUSTED_BENCHMARKS += \ + graphicsview/functional/GraphicsViewBenchmark \ + graphicsview/qgraphicsview \ + painting/qtracebench + +include(../trusted-benchmarks.pri)
\ No newline at end of file diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro index 73de556..692a0a1 100644 --- a/tests/benchmarks/network/network.pro +++ b/tests/benchmarks/network/network.pro @@ -4,3 +4,10 @@ SUBDIRS = \ kernel \ ssl \ socket + +TRUSTED_BENCHMARKS += \ + kernel/qhostinfo \ + socket/qtcpserver \ + ssl/qsslsocket + +include(../trusted-benchmarks.pri)
\ No newline at end of file diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro index 5c58751..b510c2b 100644 --- a/tests/benchmarks/opengl/opengl.pro +++ b/tests/benchmarks/opengl/opengl.pro @@ -8,3 +8,5 @@ QT += opengl # Input SOURCES += main.cpp + +include(../trusted-benchmarks.pri)
\ No newline at end of file diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro index 8d689b6..34910f7 100644 --- a/tests/benchmarks/script/script.pro +++ b/tests/benchmarks/script/script.pro @@ -3,3 +3,10 @@ SUBDIRS = \ qscriptclass \ qscriptengine \ qscriptvalue + +TRUSTED_BENCHMARKS += \ + qscriptclass \ + qscriptvalue \ + qscriptengine + +include(../trusted-benchmarks.pri)
\ No newline at end of file diff --git a/tests/benchmarks/svg/svg.pro b/tests/benchmarks/svg/svg.pro index cdc2ca5..d84eb71 100644 --- a/tests/benchmarks/svg/svg.pro +++ b/tests/benchmarks/svg/svg.pro @@ -1,3 +1,5 @@ TEMPLATE = subdirs SUBDIRS = \ qsvgrenderer + +include(../trusted-benchmarks.pri)
\ No newline at end of file diff --git a/tests/benchmarks/trusted-benchmarks.pri b/tests/benchmarks/trusted-benchmarks.pri new file mode 100644 index 0000000..632dcff --- /dev/null +++ b/tests/benchmarks/trusted-benchmarks.pri @@ -0,0 +1,8 @@ +# Edit the list of trusted benchmarks in each of the sub-targets + +check-trusted.depends = qmake +for(benchmark, TRUSTED_BENCHMARKS) { + check-trusted.commands += (cd $$benchmark && $(MAKE) -f $(MAKEFILE) check); +} + +QMAKE_EXTRA_TARGETS += check-trusted |