From 04da81e9a2b713571429dc01066727b90ef2b651 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 19 Jul 2011 09:45:08 +1000 Subject: 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 ++++ .../corelib/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 ++++ tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro | 4 ++++ tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro | 4 ++++ .../corelib/tools/containers-associative/containers-associative.pro | 4 ++++ .../corelib/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 ++++ tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro | 4 ++++ tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro | 4 ++++ tests/benchmarks/corelib/tools/qvector/qvector.pro | 4 ++++ 29 files changed, 116 insertions(+) (limited to 'tests/benchmarks/corelib') diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index f26d623ad3..75be7acf58 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 93b0992763..a42cc8f96f 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 773f0f7ccd..38b84cfa32 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 17d164d463..38bcfd0c9e 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 8663cab24b..aa26732d2e 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 b628c0af41..2c0075f009 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 2e0f6a172c..54dd0d6861 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 74fd534ec2..6f42ae0653 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 1d2d35e707..37106e1bf7 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 d7d770a944..b82e8652dd 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 a02273f7d0..c266dca0e0 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 80f9a2a398..3dcb7a72a0 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 1baaf58b7b..f54fae5059 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 5ecb94c0f6..24b9bbdcc2 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 f3dd66af44..703b5065a4 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 4e502fc5a4..8e8f21fb08 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 8fda5faaef..b4d38f25f0 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 e8014d6ccc..199f0ef765 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 bc7bd582f3..7c10332357 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 0dcee4f5dc..94c30163b6 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 656510e72d..7b2298500c 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 3474dd061a..76fa3ade41 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 dff152cda7..21814f631f 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 4bd05aa0ad..71a5c6cefe 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 5e53824a96..5fcca00a29 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 7460f8a4e4..3fd76ac63b 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 948657e8e2..07b96a9b08 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 06a5836aa1..f8df773442 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 ccab83a05b..c836027453 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 += . -- cgit v1.2.3