Set CONFIG += benchmark in corelib's various benchmarks
This leads to "make benchmark" actually running the benchmark, which would be nice, I think. Purged various CONFIG += release or -= debug lines from the same configurations; those surely only configure how the test code is compiled, which is more or less pointless; it's the code under test whose debug/release state matters, and I don't suppose that's affected by the build config of the test code. In the process, reduce diversity of the ordering of lines within these *.pro files and purge some dangling space. Change-Id: Ia9f9f0ca4c096262de928806bdfa6ea3b9e7b9ba Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Edward Welbourne
parent
1430b2944b
commit
53ed635dbb
@ -1,6 +1,7 @@
|
||||
TARGET = tst_bench_qtextcodec
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qtextcodec
|
||||
SOURCES += main.cpp
|
||||
|
||||
TESTDATA = utf-8.txt
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qdir_10000
|
||||
|
||||
SOURCES += bench_qdir_10000.cpp
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qdir_10000
|
||||
SOURCES += bench_qdir_10000.cpp
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = bench_qdir_tree
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = bench_qdir_tree
|
||||
SOURCES += bench_qdir_tree.cpp
|
||||
RESOURCES += bench_qdir_tree.qrc
|
||||
|
||||
QT = core testlib
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
TARGET = tst_bench_qdiriterator
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
CONFIG += release
|
||||
|
||||
TARGET = tst_bench_qdiriterator
|
||||
SOURCES += main.cpp qfilesystemiterator.cpp
|
||||
HEADERS += qfilesystemiterator.h
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qfile
|
||||
CONFIG += benchmark
|
||||
QT = core core-private testlib
|
||||
win32: DEFINES+= _CRT_SECURE_NO_WARNINGS
|
||||
|
||||
TARGET = tst_bench_qfile
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qfileinfo
|
||||
|
||||
CONFIG += benchmark
|
||||
QT -= gui
|
||||
QT += core-private testlib
|
||||
|
||||
CONFIG += release
|
||||
|
||||
TARGET = tst_bench_qfileinfo
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qiodevice
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
CONFIG += release
|
||||
|
||||
TARGET = tst_bench_qiodevice
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
CONFIG += benchmark
|
||||
QT = core core-private testlib
|
||||
|
||||
TARGET = ../tst_bench_qprocess
|
||||
SOURCES += ../tst_bench_qprocess.cpp
|
||||
|
||||
QT = core core-private testlib
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
SOURCES = main.cpp
|
||||
CONFIG += benchmark
|
||||
CONFIG -= qt
|
||||
CONFIG += cmdline
|
||||
winrt: QMAKE_LFLAGS += /ENTRY:mainCRTStartup
|
||||
|
||||
SOURCES = main.cpp
|
||||
DESTDIR = ./
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qtemporaryfile
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
CONFIG += release
|
||||
|
||||
TARGET = tst_bench_qtemporaryfile
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qtextstream
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
CONFIG += release
|
||||
|
||||
TARGET = tst_bench_qtextstream
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_qurl
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
win32: DEFINES+= _CRT_SECURE_NO_WARNINGS
|
||||
|
||||
TARGET = tst_qurl
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
TARGET = tst_bench_qtbinaryjson
|
||||
QT = core testlib
|
||||
CONFIG += benchmark
|
||||
CONFIG -= app_bundle
|
||||
|
||||
TARGET = tst_bench_qtbinaryjson
|
||||
SOURCES += tst_bench_qtbinaryjson.cpp
|
||||
|
||||
TESTDATA = numbers.json test.json
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_events
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_events
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
TEMPLATE = app
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qcoreapplication
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TEMPLATE = app
|
||||
CONFIG += benchmark
|
||||
QT += widgets testlib
|
||||
TARGET = tst_bench_qmetaobject
|
||||
|
||||
TARGET = tst_bench_qmetaobject
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
QT = core testlib
|
||||
TEMPLATE = app
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qmetatype
|
||||
|
||||
SOURCES += tst_qmetatype.cpp
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
CONFIG += benchmark
|
||||
QT += widgets testlib
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qobject
|
||||
|
||||
HEADERS += object.h
|
||||
SOURCES += main.cpp object.cpp
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = qtimer_vs_qmetaobject
|
||||
INCLUDEPATH += .
|
||||
|
||||
CONFIG += release
|
||||
#CONFIG += debug
|
||||
|
||||
|
||||
SOURCES += tst_qtimer_vs_qmetaobject.cpp
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
INCLUDEPATH += .
|
||||
TARGET = qtimer_vs_qmetaobject
|
||||
SOURCES += tst_qtimer_vs_qmetaobject.cpp
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
TARGET = tst_bench_qvariant
|
||||
CONFIG += benchmark
|
||||
QT += testlib
|
||||
!qtHaveModule(gui): QT -= gui
|
||||
|
||||
CONFIG += release
|
||||
#CONFIG += debug
|
||||
|
||||
|
||||
TARGET = tst_bench_qvariant
|
||||
SOURCES += tst_qvariant.cpp
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qmimedatabase
|
||||
SOURCES = main.cpp
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_quuid
|
||||
|
||||
SOURCES += tst_quuid.cpp
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_quuid
|
||||
SOURCES += tst_quuid.cpp
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qbytearray
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TESTDATA += main.cpp
|
||||
TARGET = tst_bench_qbytearray
|
||||
SOURCES += main.cpp
|
||||
TESTDATA += main.cpp
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
TARGET = tst_bench_qchar
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qchar
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_bench_qlocale
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qlocale
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qregexp
|
||||
CONFIG += benchmark
|
||||
CONFIG += exceptions
|
||||
QT = core testlib
|
||||
CONFIG += release exceptions
|
||||
|
||||
TARGET = tst_bench_qregexp
|
||||
SOURCES += main.cpp
|
||||
RESOURCES += qregexp.qrc
|
||||
|
||||
@ -17,4 +18,3 @@ qtHaveModule(script):!pcre {
|
||||
LIBS += -lboost_regex
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TARGET = tst_bench_qstring
|
||||
CONFIG += benchmark
|
||||
QT -= gui
|
||||
QT += core testlib
|
||||
SOURCES += main.cpp
|
||||
|
||||
TARGET = tst_bench_qstring
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qstringbuilder
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
QMAKE_CXXFLAGS += -g
|
||||
QMAKE_CFLAGS += -g
|
||||
|
||||
QT = core testlib
|
||||
|
||||
CONFIG += release
|
||||
|
||||
SOURCES += main.cpp
|
||||
TARGET = tst_bench_qstringbuilder
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
TARGET = tst_bench_qstringlist
|
||||
CONFIG -= debug
|
||||
CONFIG += release
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qstringlist
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qmutex
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
SOURCES += tst_qmutex.cpp
|
||||
|
||||
TARGET = tst_bench_qmutex
|
||||
SOURCES += tst_qmutex.cpp
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qreadwritelock
|
||||
QT = core-private testlib
|
||||
SOURCES += tst_qreadwritelock.cpp
|
||||
CONFIG += benchmark
|
||||
CONFIG += c++14 # for std::shared_timed_mutex
|
||||
CONFIG += c++1z # for std::shared_mutex
|
||||
QT = core-private testlib
|
||||
|
||||
TARGET = tst_bench_qreadwritelock
|
||||
SOURCES += tst_qreadwritelock.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qthreadpool
|
||||
|
||||
SOURCES += tst_qthreadpool.cpp
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qthreadpool
|
||||
SOURCES += tst_qthreadpool.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qthreadstorage
|
||||
|
||||
SOURCES += tst_qthreadstorage.cpp
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qthreadstorage
|
||||
SOURCES += tst_qthreadstorage.cpp
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qwaitcondition
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qwaitcondition
|
||||
SOURCES += tst_qwaitcondition.cpp
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_bench_qdate
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qdate
|
||||
SOURCES += tst_bench_qdate.cpp
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_bench_qdatetime
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qdatetime
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_bench_qtimezone
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qtimezone
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_containers-associative
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_containers-associative
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_containers-sequential
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_containers-sequential
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
TARGET = tst_bench_qalgorithms
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qalgorithms
|
||||
SOURCES = tst_qalgorithms.cpp
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
TARGET = tst_bench_qcontiguouscache
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
||||
CONFIG += benchmark
|
||||
CONFIG += parallel_test
|
||||
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qcontiguouscache
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TARGET = tst_bench_qcryptographichash
|
||||
CONFIG -= debug
|
||||
CONFIG += release cmdline
|
||||
CONFIG += benchmark
|
||||
CONFIG += cmdline
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qcryptographichash
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TARGET = tst_hash
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
INCLUDEPATH += .
|
||||
TARGET = tst_hash
|
||||
SOURCES += main.cpp outofline.cpp
|
||||
CONFIG += release
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_bench_qlist
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_bench_qlist
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TARGET = tst_bench_qmap
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
INCLUDEPATH += .
|
||||
TARGET = tst_bench_qmap
|
||||
SOURCES += main.cpp
|
||||
CONFIG += release
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qrect
|
||||
|
||||
QT = core testlib
|
||||
CONFIG += release
|
||||
CONFIG += benchmark
|
||||
|
||||
TARGET = tst_bench_qrect
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qringbuffer
|
||||
|
||||
CONFIG += benchmark
|
||||
QT = core-private testlib
|
||||
CONFIG += release
|
||||
|
||||
TARGET = tst_bench_qringbuffer
|
||||
SOURCES += main.cpp
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_qset
|
||||
CONFIG += benchmark
|
||||
QT = core testlib
|
||||
|
||||
TARGET = tst_qset
|
||||
SOURCES += main.cpp
|
||||
CONFIG += release
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
TARGET = tst_bench_stack
|
||||
CONFIG += benchmark
|
||||
QT = core testlib core-private
|
||||
|
||||
TARGET = tst_bench_stack
|
||||
SOURCES += main.cpp
|
||||
CONFIG += release
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
TARGET = tst_bench_vector
|
||||
CONFIG += benchmark
|
||||
QT = core testlib core-private
|
||||
|
||||
INCLUDEPATH += .
|
||||
SOURCES += main.cpp outofline.cpp
|
||||
CONFIG += release
|
||||
TARGET = tst_bench_vector
|
||||
SOURCES += main.cpp outofline.cpp
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user