diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-07-19 09:45:08 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-19 13:11:37 +0200 |
commit | 04da81e9a2b713571429dc01066727b90ef2b651 (patch) | |
tree | 0941deb976caae0600f38fce88a8e1a382d26cdf /tests/benchmarks/gui | |
parent | 3cc0cf31bd6fac92fb84ee711a04391f4d6b414b (diff) |
tests: do not run benchmarks by default in 'make check'
`make check' is intended primarily for running functional tests.
For the most part, it does not make sense to run benchmarks in the same
test environment as the functional tests.
Also, the runtime for some of these benchmarks is quite long, and some
of them share the same name as existing functional tests. These are
problematic.
Change-Id: I2ca4cfa24c73280a0b73e51423007eaff92085b8
Reviewed-on: http://codereview.qt.nokia.com/1794
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/benchmarks/gui')
29 files changed, 111 insertions, 0 deletions
diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro index 53a139a660..ce4853f510 100644 --- a/tests/benchmarks/gui/animation/qanimation/qanimation.pro +++ b/tests/benchmarks/gui/animation/qanimation/qanimation.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qanimation DEPENDPATH += . diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro index 131ec128be..b424164325 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app QT += svg diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index 3ede6e8c85..b5de1c3f7a 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicsanchorlayout diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro index d4935c0c6a..f15ac530a4 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicsitem diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro index 19e2979d98..cba9f34f60 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicslayout diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro index ff85fe8e00..2d40944a82 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicslinearlayout diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro index 1b7a5dc641..795fbcd171 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicsscene diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro index bfa374cdf8..2227887053 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicsview diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro index ed532377a1..2d2f47983d 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qgraphicswidget TEMPLATE = app diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro index aa6ab95e11..0f3c9804ae 100644 --- a/tests/benchmarks/gui/image/blendbench/blendbench.pro +++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_blendbench DEPENDPATH += . diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index ec50d98c54..2aefe2422b 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_imageConversion diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index db5ffcd01d..37f150ea50 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qimagereader diff --git a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro index 72ce42faf4..6addbb43b7 100644 --- a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro +++ b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro @@ -1,5 +1,8 @@ load(qttest_p4) +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + QT += gui-private TEMPLATE = app diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro index 78ac97d259..25c6c64f68 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qpixmapcache TEMPLATE = app diff --git a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro index 3f4d4e135c..1bdbe0199d 100644 --- a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro +++ b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qtableview diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro index e12a60c54c..0a5a394eb8 100644 --- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro +++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qapplication DEPENDPATH += . diff --git a/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro b/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro index 7ef99e4cb4..621d587d65 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro +++ b/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qguimetatype diff --git a/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro b/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro index 4e05dd7d4b..bd42faf73c 100644 --- a/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro +++ b/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qguivariant diff --git a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro index 4c6e5c724d..0be7f07a43 100644 --- a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro +++ b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro @@ -1,4 +1,7 @@ load(qttest_p4) +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_bench_qwidget SOURCES += tst_qwidget.cpp diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro b/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro index b6a2046453..8c26b5f460 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qmatrix4x4 diff --git a/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro b/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro index bd6a0d31a3..66c1eb656f 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro +++ b/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qquaternion diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 78b4f1a4e5..9f5fdf44ca 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,5 +1,8 @@ load(qttest_p4) +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + QT += gui-private TEMPLATE = app diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro index ec93a62576..94a6a9d843 100644 --- a/tests/benchmarks/gui/painting/qregion/qregion.pro +++ b/tests/benchmarks/gui/painting/qregion/qregion.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qregion DEPENDPATH += . diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro index 91f416de79..21ed8e0121 100644 --- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_qtbench diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro index 4f527f62b3..6d2c783746 100644 --- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro +++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro @@ -1,5 +1,8 @@ load(qttest_p4) +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + QT += core-private gui-private TEMPLATE = app diff --git a/tests/benchmarks/gui/painting/qtransform/qtransform.pro b/tests/benchmarks/gui/painting/qtransform/qtransform.pro index dc60407252..8164f53ba2 100644 --- a/tests/benchmarks/gui/painting/qtransform/qtransform.pro +++ b/tests/benchmarks/gui/painting/qtransform/qtransform.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qtransform diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro index f4bf9abad5..d42d54d9ff 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qstylesheetstyle DEPENDPATH += . diff --git a/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro b/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro index 973f881a33..34dee4e96b 100644 --- a/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro +++ b/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_QFontMetrics diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro index 27465b0897..602cc54c57 100644 --- a/tests/benchmarks/gui/text/qtext/qtext.pro +++ b/tests/benchmarks/gui/text/qtext/qtext.pro @@ -1,5 +1,8 @@ load(qttest_p4) +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + QT += gui-private TEMPLATE = app |