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>
This commit is contained in:
Rohan McGovern 2011-07-19 09:45:08 +10:00 committed by Qt by Nokia
parent 3cc0cf31bd
commit 04da81e9a2
69 changed files with 267 additions and 1 deletions

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_bench_qtextcodec TARGET = tst_bench_qtextcodec
QT -= gui QT -= gui
SOURCES += main.cpp SOURCES += main.cpp

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = bench_qdir_10000 TARGET = bench_qdir_10000
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = bench_qdir_tree TARGET = bench_qdir_tree
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qdiriterator TARGET = tst_bench_qdiriterator
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qfile TARGET = tst_bench_qfile
QT -= gui QT -= gui

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qfileinfo TARGET = tst_bench_qfileinfo
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qiodevice TARGET = tst_bench_qiodevice
TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 TARGET.EPOCHEAPSIZE = 0x100000 0x2000000

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qtemporaryfile TARGET = tst_bench_qtemporaryfile
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_qurl TARGET = tst_qurl
QT -= gui QT -= gui

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_events TARGET = tst_bench_events
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qmetaobject TARGET = tst_bench_qmetaobject

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
QT = core QT = core
TEMPLATE = app TEMPLATE = app
TARGET = tst_qmetatype TARGET = tst_qmetatype

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qobject TARGET = tst_bench_qobject
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = qtimer_vs_qmetaobject TARGET = qtimer_vs_qmetaobject
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qvariant TARGET = tst_bench_qvariant
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_quuid TARGET = tst_bench_quuid

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qmutex TARGET = tst_bench_qmutex
QT -= gui QT -= gui

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qthreadstorage TARGET = tst_bench_qthreadstorage

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qwaitcondition TARGET = tst_bench_qwaitcondition
QT -= gui QT -= gui

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_containers-associative TARGET = tst_bench_containers-associative
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_containers-sequential TARGET = tst_bench_containers-sequential
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qbytearray TARGET = tst_bench_qbytearray
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_hash TARGET = tst_hash
QT = core QT = core
INCLUDEPATH += . INCLUDEPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qrect TARGET = tst_bench_qrect
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qregexp TARGET = tst_bench_qregexp
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_bench_qstring TARGET = tst_bench_qstring
QT -= gui QT -= gui
QT += core-private QT += core-private

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qstringbuilder TARGET = tst_bench_qstringbuilder

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_bench_qstringlist TARGET = tst_bench_qstringlist
CONFIG -= debug CONFIG -= debug
CONFIG += release CONFIG += release

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_vector TARGET = tst_vector
QT = core QT = core
INCLUDEPATH += . INCLUDEPATH += .

View File

@ -1,4 +1,3 @@
load(qttest_p4)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = server test SUBDIRS = server test

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
SOURCES += ../tst_qdbusperformance.cpp SOURCES += ../tst_qdbusperformance.cpp
HEADERS += ../serverobject.h HEADERS += ../serverobject.h
TARGET = ../tst_qdbusperformance TARGET = ../tst_qdbusperformance

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_bench_qdbustype TARGET = tst_bench_qdbustype
QT -= gui QT -= gui
QT += dbus dbus-private QT += dbus dbus-private

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qanimation TARGET = tst_bench_qanimation
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
QT += svg QT += svg

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicsanchorlayout TARGET = tst_bench_qgraphicsanchorlayout

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicsitem TARGET = tst_bench_qgraphicsitem

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicslayout TARGET = tst_bench_qgraphicslayout

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicslinearlayout TARGET = tst_bench_qgraphicslinearlayout

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicsscene TARGET = tst_bench_qgraphicsscene

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicsview TARGET = tst_bench_qgraphicsview

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qgraphicswidget TARGET = tst_bench_qgraphicswidget
TEMPLATE = app TEMPLATE = app

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_blendbench TARGET = tst_bench_blendbench
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_imageConversion TARGET = tst_bench_imageConversion

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qimagereader TARGET = tst_bench_qimagereader

View File

@ -1,5 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
QT += gui-private QT += gui-private
TEMPLATE = app TEMPLATE = app

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qpixmapcache TARGET = tst_bench_qpixmapcache
TEMPLATE = app TEMPLATE = app

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qtableview TARGET = tst_bench_qtableview

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qapplication TARGET = tst_bench_qapplication
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qguimetatype TARGET = tst_bench_qguimetatype

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qguivariant TARGET = tst_bench_qguivariant

View File

@ -1,4 +1,7 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TARGET = tst_bench_qwidget TARGET = tst_bench_qwidget
SOURCES += tst_qwidget.cpp SOURCES += tst_qwidget.cpp

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qmatrix4x4 TARGET = tst_bench_qmatrix4x4

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qquaternion TARGET = tst_bench_qquaternion

View File

@ -1,5 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
QT += gui-private QT += gui-private
TEMPLATE = app TEMPLATE = app

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qregion TARGET = tst_bench_qregion
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_qtbench TARGET = tst_qtbench

View File

@ -1,5 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
QT += core-private gui-private QT += core-private gui-private
TEMPLATE = app TEMPLATE = app

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qtransform TARGET = tst_bench_qtransform

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qstylesheetstyle TARGET = tst_bench_qstylesheetstyle
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_QFontMetrics TARGET = tst_bench_QFontMetrics

View File

@ -1,5 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
QT += gui-private QT += gui-private
TEMPLATE = app TEMPLATE = app

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qfile_vs_qnetworkaccessmanager TARGET = tst_bench_qfile_vs_qnetworkaccessmanager
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qnetworkdiskcache TARGET = tst_bench_qnetworkdiskcache
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qnetworkreply TARGET = tst_bench_qnetworkreply
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qhostinfo TARGET = tst_bench_qhostinfo
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qtcpserver TARGET = tst_bench_qtcpserver
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_qsslsocket TARGET = tst_bench_qsslsocket
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = tst_bench_opengl TARGET = tst_bench_opengl
DEPENDPATH += . DEPENDPATH += .

View File

@ -1,4 +1,8 @@
load(qttest_p4) load(qttest_p4)
# do not run benchmarks by default in 'make check'
CONFIG -= testcase
TEMPLATE = app TEMPLATE = app
TARGET = jpeg TARGET = jpeg
DEPENDPATH += . DEPENDPATH += .