From 04da81e9a2b713571429dc01066727b90ef2b651 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 19 Jul 2011 09:45:08 +1000 Subject: [PATCH] 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 Reviewed-by: Kalle Lehtonen Reviewed-by: Rohan McGovern --- tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro | 4 ++++ tests/benchmarks/corelib/io/qdir/10000/10000.pro | 4 ++++ tests/benchmarks/corelib/io/qdir/tree/tree.pro | 4 ++++ tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro | 4 ++++ tests/benchmarks/corelib/io/qfile/qfile.pro | 4 ++++ tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro | 4 ++++ tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | 4 ++++ tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro | 4 ++++ tests/benchmarks/corelib/io/qurl/qurl.pro | 4 ++++ tests/benchmarks/corelib/kernel/events/events.pro | 4 ++++ tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro | 4 ++++ tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro | 4 ++++ tests/benchmarks/corelib/kernel/qobject/qobject.pro | 4 ++++ .../kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro | 4 ++++ tests/benchmarks/corelib/kernel/qvariant/qvariant.pro | 4 ++++ tests/benchmarks/corelib/plugin/quuid/quuid.pro | 4 ++++ tests/benchmarks/corelib/thread/qmutex/qmutex.pro | 4 ++++ .../corelib/thread/qthreadstorage/qthreadstorage.pro | 4 ++++ .../corelib/thread/qwaitcondition/qwaitcondition.pro | 4 ++++ .../tools/containers-associative/containers-associative.pro | 4 ++++ .../tools/containers-sequential/containers-sequential.pro | 4 ++++ tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro | 4 ++++ tests/benchmarks/corelib/tools/qhash/qhash.pro | 4 ++++ tests/benchmarks/corelib/tools/qrect/qrect.pro | 4 ++++ tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 4 ++++ tests/benchmarks/corelib/tools/qstring/qstring.pro | 4 ++++ .../corelib/tools/qstringbuilder/qstringbuilder.pro | 4 ++++ tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro | 4 ++++ tests/benchmarks/corelib/tools/qvector/qvector.pro | 4 ++++ tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro | 1 - tests/benchmarks/dbus/qdbusperformance/test/test.pro | 4 ++++ tests/benchmarks/dbus/qdbustype/qdbustype.pro | 4 ++++ tests/benchmarks/gui/animation/qanimation/qanimation.pro | 4 ++++ .../GraphicsViewBenchmark/GraphicsViewBenchmark.pro | 4 ++++ .../qgraphicsanchorlayout/qgraphicsanchorlayout.pro | 4 ++++ .../gui/graphicsview/qgraphicsitem/qgraphicsitem.pro | 4 ++++ .../gui/graphicsview/qgraphicslayout/qgraphicslayout.pro | 4 ++++ .../qgraphicslinearlayout/qgraphicslinearlayout.pro | 4 ++++ .../gui/graphicsview/qgraphicsscene/qgraphicsscene.pro | 4 ++++ .../gui/graphicsview/qgraphicsview/qgraphicsview.pro | 4 ++++ .../gui/graphicsview/qgraphicswidget/qgraphicswidget.pro | 4 ++++ tests/benchmarks/gui/image/blendbench/blendbench.pro | 4 ++++ .../gui/image/qimageconversion/qimageconversion.pro | 4 ++++ tests/benchmarks/gui/image/qimagereader/qimagereader.pro | 4 ++++ tests/benchmarks/gui/image/qpixmap/qpixmap.pro | 3 +++ tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro | 4 ++++ tests/benchmarks/gui/itemviews/qtableview/qtableview.pro | 4 ++++ tests/benchmarks/gui/kernel/qapplication/qapplication.pro | 4 ++++ tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro | 4 ++++ tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro | 4 ++++ tests/benchmarks/gui/kernel/qwidget/qwidget.pro | 3 +++ tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro | 4 ++++ tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro | 4 ++++ tests/benchmarks/gui/painting/qpainter/qpainter.pro | 3 +++ tests/benchmarks/gui/painting/qregion/qregion.pro | 4 ++++ tests/benchmarks/gui/painting/qtbench/qtbench.pro | 4 ++++ tests/benchmarks/gui/painting/qtracebench/qtracebench.pro | 3 +++ tests/benchmarks/gui/painting/qtransform/qtransform.pro | 4 ++++ .../gui/styles/qstylesheetstyle/qstylesheetstyle.pro | 4 ++++ tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro | 4 ++++ tests/benchmarks/gui/text/qtext/qtext.pro | 3 +++ .../qfile_vs_qnetworkaccessmanager.pro | 4 ++++ .../network/access/qnetworkdiskcache/qnetworkdiskcache.pro | 4 ++++ .../benchmarks/network/access/qnetworkreply/qnetworkreply.pro | 4 ++++ tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro | 4 ++++ tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro | 4 ++++ tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro | 4 ++++ tests/benchmarks/opengl/opengl.pro | 4 ++++ tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro | 4 ++++ 69 files changed, 267 insertions(+), 1 deletion(-) diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index f26d623ad3e..75be7acf582 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_bench_qtextcodec QT -= gui SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro index 93b09927633..a42cc8f96f0 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro +++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = bench_qdir_10000 DEPENDPATH += . diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro index 773f0f7ccd9..38b84cfa325 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro +++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = bench_qdir_tree DEPENDPATH += . diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index 17d164d4634..38bcfd0c9e5 100755 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qdiriterator DEPENDPATH += . diff --git a/tests/benchmarks/corelib/io/qfile/qfile.pro b/tests/benchmarks/corelib/io/qfile/qfile.pro index 8663cab24b8..aa26732d2ee 100644 --- a/tests/benchmarks/corelib/io/qfile/qfile.pro +++ b/tests/benchmarks/corelib/io/qfile/qfile.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qfile QT -= gui diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index b628c0af412..2c0075f0097 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qfileinfo DEPENDPATH += . diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 2e0f6a172ca..54dd0d68619 100755 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qiodevice TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro index 74fd534ec29..6f42ae06530 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qtemporaryfile DEPENDPATH += . diff --git a/tests/benchmarks/corelib/io/qurl/qurl.pro b/tests/benchmarks/corelib/io/qurl/qurl.pro index 1d2d35e7071..37106e1bf7b 100644 --- a/tests/benchmarks/corelib/io/qurl/qurl.pro +++ b/tests/benchmarks/corelib/io/qurl/qurl.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_qurl QT -= gui diff --git a/tests/benchmarks/corelib/kernel/events/events.pro b/tests/benchmarks/corelib/kernel/events/events.pro index d7d770a9443..b82e8652dda 100644 --- a/tests/benchmarks/corelib/kernel/events/events.pro +++ b/tests/benchmarks/corelib/kernel/events/events.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_events DEPENDPATH += . diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro index a02273f7d00..c266dca0e0e 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qmetaobject diff --git a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro index 80f9a2a3987..3dcb7a72a05 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + QT = core TEMPLATE = app TARGET = tst_qmetatype diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro index 1baaf58b7bf..f54fae50594 100644 --- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro +++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qobject DEPENDPATH += . diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro index 5ecb94c0f62..24b9bbdcc22 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = qtimer_vs_qmetaobject DEPENDPATH += . diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro index f3dd66af440..703b5065a42 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro +++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qvariant DEPENDPATH += . diff --git a/tests/benchmarks/corelib/plugin/quuid/quuid.pro b/tests/benchmarks/corelib/plugin/quuid/quuid.pro index 4e502fc5a4d..8e8f21fb088 100644 --- a/tests/benchmarks/corelib/plugin/quuid/quuid.pro +++ b/tests/benchmarks/corelib/plugin/quuid/quuid.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_quuid diff --git a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro index 8fda5faaef6..b4d38f25f05 100644 --- a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro +++ b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qmutex QT -= gui diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro index e8014d6ccc7..199f0ef765d 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro +++ b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qthreadstorage diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro index bc7bd582f3c..7c10332357a 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qwaitcondition QT -= gui diff --git a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro index 0dcee4f5dca..94c30163b65 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro +++ b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_containers-associative DEPENDPATH += . diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro index 656510e72d2..7b2298500ce 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro +++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_containers-sequential DEPENDPATH += . diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro index 3474dd061a1..76fa3ade41b 100755 --- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qbytearray DEPENDPATH += . diff --git a/tests/benchmarks/corelib/tools/qhash/qhash.pro b/tests/benchmarks/corelib/tools/qhash/qhash.pro index dff152cda79..21814f631f6 100644 --- a/tests/benchmarks/corelib/tools/qhash/qhash.pro +++ b/tests/benchmarks/corelib/tools/qhash/qhash.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_hash QT = core INCLUDEPATH += . diff --git a/tests/benchmarks/corelib/tools/qrect/qrect.pro b/tests/benchmarks/corelib/tools/qrect/qrect.pro index 4bd05aa0ad0..71a5c6cefe7 100644 --- a/tests/benchmarks/corelib/tools/qrect/qrect.pro +++ b/tests/benchmarks/corelib/tools/qrect/qrect.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qrect DEPENDPATH += . diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index 5e53824a968..5fcca00a294 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qregexp DEPENDPATH += . diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 7460f8a4e44..3fd76ac63b1 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_bench_qstring QT -= gui QT += core-private diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro index 948657e8e2d..07b96a9b082 100644 --- a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro +++ b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qstringbuilder diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index 06a5836aa1d..f8df773442c 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_bench_qstringlist CONFIG -= debug CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qvector/qvector.pro b/tests/benchmarks/corelib/tools/qvector/qvector.pro index ccab83a05b6..c836027453f 100644 --- a/tests/benchmarks/corelib/tools/qvector/qvector.pro +++ b/tests/benchmarks/corelib/tools/qvector/qvector.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_vector QT = core INCLUDEPATH += . diff --git a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro index 90f88a70ec1..e90d38a55c2 100644 --- a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro +++ b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro @@ -1,4 +1,3 @@ -load(qttest_p4) TEMPLATE = subdirs CONFIG += ordered SUBDIRS = server test diff --git a/tests/benchmarks/dbus/qdbusperformance/test/test.pro b/tests/benchmarks/dbus/qdbusperformance/test/test.pro index 9f5712e9e26..14ecee8339f 100644 --- a/tests/benchmarks/dbus/qdbusperformance/test/test.pro +++ b/tests/benchmarks/dbus/qdbusperformance/test/test.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + SOURCES += ../tst_qdbusperformance.cpp HEADERS += ../serverobject.h TARGET = ../tst_qdbusperformance diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index 2f3edf074b6..325712eddef 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TARGET = tst_bench_qdbustype QT -= gui QT += dbus dbus-private diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro index 53a139a6605..ce4853f5108 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 131ec128be1..b424164325c 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 3ede6e8c853..b5de1c3f7a0 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 d4935c0c6a0..f15ac530a4e 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 19e2979d983..cba9f34f601 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 ff85fe8e00d..2d40944a820 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 1b7a5dc6415..795fbcd171b 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 bfa374cdf82..22278870533 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 ed532377a11..2d2f47983d5 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 aa6ab95e11f..0f3c9804aea 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 ec50d98c549..2aefe2422bc 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 db5ffcd01d2..37f150ea50e 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 72ce42faf49..6addbb43b75 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 78ac97d2593..25c6c64f688 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 3f4d4e135cd..1bdbe0199d2 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 e12a60c54c5..0a5a394eb80 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 7ef99e4cb44..621d587d658 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 4e05dd7d4b3..bd42faf73ce 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 4c6e5c724df..0be7f07a439 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 b6a2046453d..8c26b5f4601 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 bd6a0d31a39..66c1eb656f1 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 78b4f1a4e52..9f5fdf44cad 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 ec93a625764..94a6a9d8431 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 91f416de79f..21ed8e0121f 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 4f527f62b3e..6d2c783746f 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 dc604072522..8164f53ba2b 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 f4bf9abad53..d42d54d9ff2 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 973f881a33d..34dee4e96b2 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 27465b0897c..602cc54c57a 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 diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro index 0949af790ab..33e6923a6a0 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qfile_vs_qnetworkaccessmanager DEPENDPATH += . diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index 7f665b332e7..19cf771bcc0 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qnetworkdiskcache DEPENDPATH += . diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro index 9d96dc70250..de1487d4897 100644 --- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qnetworkreply DEPENDPATH += . diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index d456620d5a0..42396b8cdb8 100755 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qhostinfo DEPENDPATH += . diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro index e5b93469545..fc27158e170 100644 --- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro +++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qtcpserver DEPENDPATH += . diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro index da34a028d33..52a443f7f7d 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_qsslsocket DEPENDPATH += . diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro index 8646413bc7d..1fc9c7d1876 100644 --- a/tests/benchmarks/opengl/opengl.pro +++ b/tests/benchmarks/opengl/opengl.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = tst_bench_opengl DEPENDPATH += . diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro index e106f3e1b32..0b286743bd2 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro @@ -1,4 +1,8 @@ load(qttest_p4) + +# do not run benchmarks by default in 'make check' +CONFIG -= testcase + TEMPLATE = app TARGET = jpeg DEPENDPATH += .