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>

tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro

@@ -1,6 +1,7 @@
-TARGET = tst_bench_qtextcodec
+CONFIG += benchmark
 QT = core testlib
+
+TARGET = tst_bench_qtextcodec
 SOURCES += main.cpp
 
 TESTDATA = utf-8.txt
-

tests/benchmarks/corelib/io/qdir/10000/10000.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qdir_10000
+CONFIG += benchmark
-
-SOURCES += bench_qdir_10000.cpp
-
 QT = core testlib
+
+TARGET = tst_bench_qdir_10000
+SOURCES += bench_qdir_10000.cpp

tests/benchmarks/corelib/io/qdir/tree/tree.pro

@@ -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

tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro

@@ -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

tests/benchmarks/corelib/io/qfile/qfile.pro

@@ -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

tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro

@@ -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

tests/benchmarks/corelib/io/qiodevice/qiodevice.pro

@@ -1,8 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qiodevice
+CONFIG += benchmark
-
 QT = core testlib
 
-CONFIG += release
+TARGET = tst_bench_qiodevice
-
 SOURCES += main.cpp

tests/benchmarks/corelib/io/qprocess/test/test.pro

@@ -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

tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro

@@ -1,5 +1,7 @@
-SOURCES = main.cpp
+CONFIG += benchmark
 CONFIG -= qt
 CONFIG += cmdline
 winrt: QMAKE_LFLAGS += /ENTRY:mainCRTStartup
+
+SOURCES = main.cpp
 DESTDIR = ./

tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro

@@ -1,8 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qtemporaryfile
+CONFIG += benchmark
-
 QT = core testlib
 
-CONFIG += release
+TARGET = tst_bench_qtemporaryfile
-
 SOURCES += main.cpp

tests/benchmarks/corelib/io/qtextstream/qtextstream.pro

@@ -1,8 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qtextstream
+CONFIG += benchmark
-
 QT = core testlib
 
-CONFIG += release
+TARGET = tst_bench_qtextstream
-
 SOURCES += main.cpp

tests/benchmarks/corelib/io/qurl/qurl.pro

@@ -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

tests/benchmarks/corelib/json/json.pro

@@ -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

tests/benchmarks/corelib/kernel/events/events.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_events
+CONFIG += benchmark
-
 QT = core testlib
 
+TARGET = tst_bench_events
 SOURCES += main.cpp

tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro

@@ -1,6 +1,6 @@
+TEMPLATE = app
+CONFIG += benchmark
 QT = core testlib
 
-TEMPLATE = app
 TARGET = tst_bench_qcoreapplication
-
 SOURCES += main.cpp

tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
+CONFIG += benchmark
 QT += widgets testlib
-TARGET = tst_bench_qmetaobject
 
+TARGET = tst_bench_qmetaobject
 SOURCES += main.cpp

tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro

@@ -1,6 +1,6 @@
-QT = core testlib
 TEMPLATE = app
+CONFIG += benchmark
+QT = core testlib
+
 TARGET = tst_bench_qmetatype
-
 SOURCES += tst_qmetatype.cpp
-

tests/benchmarks/corelib/kernel/qobject/qobject.pro

@@ -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

tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro

@@ -1,10 +1,7 @@
 TEMPLATE = app
-TARGET = qtimer_vs_qmetaobject
+CONFIG += benchmark
-INCLUDEPATH += .
-
-CONFIG += release
-#CONFIG += debug
-
-
-SOURCES += tst_qtimer_vs_qmetaobject.cpp
 QT = core testlib
+
+INCLUDEPATH += .
+TARGET = qtimer_vs_qmetaobject
+SOURCES += tst_qtimer_vs_qmetaobject.cpp

tests/benchmarks/corelib/kernel/qvariant/qvariant.pro

@@ -1,9 +1,6 @@
-TARGET = tst_bench_qvariant
+CONFIG += benchmark
 QT += testlib
 !qtHaveModule(gui): QT -= gui
 
-CONFIG += release
+TARGET = tst_bench_qvariant
-#CONFIG += debug
-
-
 SOURCES += tst_qvariant.cpp

tests/benchmarks/corelib/mimetypes/qmimedatabase/qmimedatabase.pro

@@ -1,5 +1,5 @@
+CONFIG += benchmark
 QT = core testlib
 
 TARGET  = tst_bench_qmimedatabase
 SOURCES = main.cpp
-

tests/benchmarks/corelib/plugin/quuid/quuid.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_quuid
+CONFIG += benchmark
-
-SOURCES += tst_quuid.cpp
 QT = core testlib
+
+TARGET = tst_bench_quuid
+SOURCES += tst_quuid.cpp

tests/benchmarks/corelib/text/qbytearray/qbytearray.pro

@@ -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

tests/benchmarks/corelib/text/qchar/qchar.pro

@@ -1,3 +1,5 @@
-TARGET = tst_bench_qchar
+CONFIG += benchmark
 QT = core testlib
+
+TARGET = tst_bench_qchar
 SOURCES += main.cpp

tests/benchmarks/corelib/text/qlocale/qlocale.pro

@@ -1,4 +1,5 @@
-TARGET = tst_bench_qlocale
+CONFIG += benchmark
 QT = core testlib
 
+TARGET = tst_bench_qlocale
 SOURCES += main.cpp

tests/benchmarks/corelib/text/qregexp/qregexp.pro

@@ -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
     }
 }
-

tests/benchmarks/corelib/text/qstring/qstring.pro

@@ -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

tests/benchmarks/corelib/text/qstringbuilder/qstringbuilder.pro

@@ -1,11 +1,9 @@
 TEMPLATE = app
-TARGET = tst_bench_qstringbuilder
+CONFIG += benchmark
+QT = core testlib
 
 QMAKE_CXXFLAGS += -g
 QMAKE_CFLAGS += -g
 
-QT = core testlib
+TARGET = tst_bench_qstringbuilder
-
-CONFIG += release
-
 SOURCES += main.cpp

tests/benchmarks/corelib/text/qstringlist/qstringlist.pro

@@ -1,5 +1,5 @@
-TARGET = tst_bench_qstringlist
+CONFIG += benchmark
-CONFIG -= debug
-CONFIG += release
 QT = core testlib
+
+TARGET = tst_bench_qstringlist
 SOURCES += main.cpp

tests/benchmarks/corelib/thread/qmutex/qmutex.pro

@@ -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

tests/benchmarks/corelib/thread/qreadwritelock/qreadwritelock.pro

@@ -1,7 +1,8 @@
 TEMPLATE = app
-TARGET = tst_bench_qreadwritelock
+CONFIG += benchmark
-QT = core-private testlib
-SOURCES += tst_qreadwritelock.cpp
 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

tests/benchmarks/corelib/thread/qthreadpool/qthreadpool.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qthreadpool
+CONFIG += benchmark
-
-SOURCES += tst_qthreadpool.cpp
 QT = core testlib
+
+TARGET = tst_bench_qthreadpool
+SOURCES += tst_qthreadpool.cpp

tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qthreadstorage
+CONFIG += benchmark
-
-SOURCES += tst_qthreadstorage.cpp
 QT = core testlib
+
+TARGET = tst_bench_qthreadstorage
+SOURCES += tst_qthreadstorage.cpp

tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro

@@ -1,4 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qwaitcondition
+CONFIG += benchmark
 QT = core testlib
+
+TARGET = tst_bench_qwaitcondition
 SOURCES += tst_qwaitcondition.cpp

tests/benchmarks/corelib/time/qdate/qdate.pro

@@ -1,4 +1,5 @@
-TARGET = tst_bench_qdate
+CONFIG += benchmark
 QT = core testlib
 
+TARGET = tst_bench_qdate
 SOURCES += tst_bench_qdate.cpp

tests/benchmarks/corelib/time/qdatetime/qdatetime.pro

@@ -1,4 +1,5 @@
-TARGET = tst_bench_qdatetime
+CONFIG += benchmark
 QT = core testlib
 
+TARGET = tst_bench_qdatetime
 SOURCES += main.cpp

tests/benchmarks/corelib/time/qtimezone/qtimezone.pro

@@ -1,4 +1,5 @@
-TARGET = tst_bench_qtimezone
+CONFIG += benchmark
 QT = core testlib
 
+TARGET = tst_bench_qtimezone
 SOURCES += main.cpp

tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_containers-associative
+CONFIG += benchmark
-
 QT = core testlib
 
+TARGET = tst_bench_containers-associative
 SOURCES += main.cpp

tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_containers-sequential
+CONFIG += benchmark
-
 QT = core testlib
 
+TARGET = tst_bench_containers-sequential
 SOURCES += main.cpp

tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro

@@ -1,3 +1,5 @@
-TARGET = tst_bench_qalgorithms
+CONFIG += benchmark
 QT = core testlib
+
+TARGET = tst_bench_qalgorithms
 SOURCES = tst_qalgorithms.cpp

tests/benchmarks/corelib/tools/qcontiguouscache/qcontiguouscache.pro

@@ -1,7 +1,6 @@
-TARGET = tst_bench_qcontiguouscache
+CONFIG += benchmark
-
-SOURCES += main.cpp
-
 CONFIG += parallel_test
-
 QT = core testlib
+
+TARGET = tst_bench_qcontiguouscache
+SOURCES += main.cpp

tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro

@@ -1,5 +1,6 @@
-TARGET = tst_bench_qcryptographichash
+CONFIG += benchmark
-CONFIG -= debug
+CONFIG += cmdline
-CONFIG += release cmdline
 QT = core testlib
+
+TARGET = tst_bench_qcryptographichash
 SOURCES += main.cpp

tests/benchmarks/corelib/tools/qhash/qhash.pro

@@ -1,5 +1,6 @@
-TARGET = tst_hash
+CONFIG += benchmark
 QT = core testlib
+
 INCLUDEPATH += .
+TARGET = tst_hash
 SOURCES += main.cpp outofline.cpp
-CONFIG += release

tests/benchmarks/corelib/tools/qlist/qlist.pro

@@ -1,4 +1,5 @@
-TARGET = tst_bench_qlist
+CONFIG += benchmark
 QT = core testlib
 
+TARGET = tst_bench_qlist
 SOURCES += main.cpp

tests/benchmarks/corelib/tools/qmap/qmap.pro

@@ -1,5 +1,6 @@
-TARGET = tst_bench_qmap
+CONFIG += benchmark
 QT = core testlib
+
 INCLUDEPATH += .
+TARGET = tst_bench_qmap
 SOURCES += main.cpp
-CONFIG += release

tests/benchmarks/corelib/tools/qrect/qrect.pro

@@ -1,7 +1,6 @@
 TEMPLATE = app
-TARGET = tst_bench_qrect
-
 QT = core testlib
-CONFIG += release
+CONFIG += benchmark
 
+TARGET = tst_bench_qrect
 SOURCES += main.cpp

tests/benchmarks/corelib/tools/qringbuffer/qringbuffer.pro

@@ -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

tests/benchmarks/corelib/tools/qset/qset.pro

@@ -1,4 +1,5 @@
-TARGET = tst_qset
+CONFIG += benchmark
 QT = core testlib
+
+TARGET = tst_qset
 SOURCES += main.cpp
-CONFIG += release

tests/benchmarks/corelib/tools/qstack/qstack.pro

@@ -1,4 +1,5 @@
-TARGET = tst_bench_stack
+CONFIG += benchmark
 QT = core testlib core-private
+
+TARGET = tst_bench_stack
 SOURCES += main.cpp
-CONFIG += release

tests/benchmarks/corelib/tools/qvector/qvector.pro

@@ -1,5 +1,6 @@
-TARGET = tst_bench_vector
+CONFIG += benchmark
 QT = core testlib core-private
+
 INCLUDEPATH += .
+TARGET = tst_bench_vector
 SOURCES += main.cpp outofline.cpp
-CONFIG += release