From 55b6e6fdfb14c467d1baab67271f85095929cd2a Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 25 Oct 2011 11:59:25 +1000 Subject: benchmarks: eliminated usage of qttest_p4.prf qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I48ab0ee64d8348cada2e6c7b27c67b6bbc36280d Reviewed-by: Jason McDonald --- tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro | 7 +------ tests/benchmarks/corelib/io/qdir/10000/10000.pro | 7 +------ tests/benchmarks/corelib/io/qdir/tree/tree.pro | 7 +------ tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro | 7 +------ tests/benchmarks/corelib/io/qfile/qfile.pro | 7 +------ tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro | 7 +------ tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | 7 +------ tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro | 7 +------ tests/benchmarks/corelib/io/qurl/qurl.pro | 7 +------ tests/benchmarks/corelib/kernel/events/events.pro | 7 +------ tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro | 7 +------ tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro | 7 +------ tests/benchmarks/corelib/kernel/qobject/qobject.pro | 6 +----- .../corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro | 7 +------ tests/benchmarks/corelib/kernel/qvariant/qvariant.pro | 6 +----- tests/benchmarks/corelib/plugin/quuid/quuid.pro | 7 +------ tests/benchmarks/corelib/thread/qmutex/qmutex.pro | 7 +------ tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro | 7 +------ tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro | 7 +------ .../tools/containers-associative/containers-associative.pro | 7 +------ .../corelib/tools/containers-sequential/containers-sequential.pro | 7 +------ tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro | 7 +------ tests/benchmarks/corelib/tools/qchar/qchar.pro | 7 +------ tests/benchmarks/corelib/tools/qhash/qhash.pro | 7 +------ tests/benchmarks/corelib/tools/qlist/qlist.pro | 7 +------ tests/benchmarks/corelib/tools/qrect/qrect.pro | 7 +------ tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 7 +------ tests/benchmarks/corelib/tools/qstring/qstring.pro | 7 +------ tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro | 7 +------ tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro | 7 +------ tests/benchmarks/corelib/tools/qvector/qvector.pro | 7 +------ 31 files changed, 31 insertions(+), 184 deletions(-) (limited to 'tests/benchmarks/corelib') diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index 170d93ab0c..c13c714543 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qtextcodec -QT -= gui +QT = core testlib SOURCES += main.cpp wince*:{ diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro index a42cc8f96f..0319f2c195 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro +++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = bench_qdir_10000 DEPENDPATH += . @@ -11,4 +6,4 @@ INCLUDEPATH += . # Input SOURCES += bench_qdir_10000.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro index 38b84cfa32..415580cc46 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro +++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = bench_qdir_tree DEPENDPATH += . @@ -12,4 +7,4 @@ INCLUDEPATH += . SOURCES += bench_qdir_tree.cpp RESOURCES += bench_qdir_tree.qrc -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index a7400528e3..af3be799c6 100755 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qdiriterator DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qfile/qfile.pro b/tests/benchmarks/corelib/io/qfile/qfile.pro index aa26732d2e..933469071d 100644 --- a/tests/benchmarks/corelib/io/qfile/qfile.pro +++ b/tests/benchmarks/corelib/io/qfile/qfile.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfile -QT -= gui +QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index 2c0075f009..0dca21c1a8 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfileinfo DEPENDPATH += . @@ -10,7 +5,7 @@ INCLUDEPATH += . QT -= gui -QT += core-private +QT += core-private testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 54dd0d6861..0dff0ce86e 100755 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qiodevice TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro index 6f42ae0653..6ebee8a659 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtemporaryfile DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qurl/qurl.pro b/tests/benchmarks/corelib/io/qurl/qurl.pro index 37106e1bf7..52f7bdc8b6 100644 --- a/tests/benchmarks/corelib/io/qurl/qurl.pro +++ b/tests/benchmarks/corelib/io/qurl/qurl.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_qurl -QT -= gui +QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/events/events.pro b/tests/benchmarks/corelib/kernel/events/events.pro index b82e8652dd..fb50116495 100644 --- a/tests/benchmarks/corelib/kernel/events/events.pro +++ b/tests/benchmarks/corelib/kernel/events/events.pro @@ -1,12 +1,7 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_events DEPENDPATH += . INCLUDEPATH += . # Input SOURCES += main.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro index 1c3cc0e51a..47d2acb9b1 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app -QT += widgets +QT += widgets testlib TARGET = tst_bench_qmetaobject SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro index 3dcb7a72a0..5555e5cd14 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - -QT = core +QT = core testlib TEMPLATE = app TARGET = tst_qmetatype diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro index 991c965f56..8edd038b0d 100644 --- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro +++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qobject 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 24b9bbdcc2..a5daf0f8ef 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,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = qtimer_vs_qmetaobject DEPENDPATH += . @@ -13,4 +8,4 @@ CONFIG += release SOURCES += tst_qtimer_vs_qmetaobject.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro index 703b5065a4..12d131f262 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro +++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro @@ -1,12 +1,8 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qvariant DEPENDPATH += . INCLUDEPATH += . +QT += testlib CONFIG += release #CONFIG += debug diff --git a/tests/benchmarks/corelib/plugin/quuid/quuid.pro b/tests/benchmarks/corelib/plugin/quuid/quuid.pro index 8e8f21fb08..8f88bb85b4 100644 --- a/tests/benchmarks/corelib/plugin/quuid/quuid.pro +++ b/tests/benchmarks/corelib/plugin/quuid/quuid.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_quuid SOURCES += tst_quuid.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro index b4d38f25f0..ec87f60919 100644 --- a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro +++ b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qmutex -QT -= gui +QT = core testlib SOURCES += tst_qmutex.cpp diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro index 199f0ef765..95afc951bc 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro +++ b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qthreadstorage SOURCES += tst_qthreadstorage.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro index 7c10332357..43c7921a93 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qwaitcondition -QT -= gui +QT = core testlib SOURCES += tst_qwaitcondition.cpp diff --git a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro index 94c30163b6..940973d8db 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro +++ b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_containers-associative DEPENDPATH += . @@ -10,4 +5,4 @@ INCLUDEPATH += . # Input SOURCES += main.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro index 7b2298500c..0ae83d70f7 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro +++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_containers-sequential DEPENDPATH += . @@ -10,4 +5,4 @@ INCLUDEPATH += . # Input SOURCES += main.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro index 76fa3ade41..10fdc7261e 100755 --- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qbytearray DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qchar/qchar.pro b/tests/benchmarks/corelib/tools/qchar/qchar.pro index c4a884f946..80a9861f48 100644 --- a/tests/benchmarks/corelib/tools/qchar/qchar.pro +++ b/tests/benchmarks/corelib/tools/qchar/qchar.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qchar -QT -= gui +QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qhash/qhash.pro b/tests/benchmarks/corelib/tools/qhash/qhash.pro index 21814f631f..51d3e7f253 100644 --- a/tests/benchmarks/corelib/tools/qhash/qhash.pro +++ b/tests/benchmarks/corelib/tools/qhash/qhash.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_hash -QT = core +QT = core testlib INCLUDEPATH += . SOURCES += qhash_string.cpp outofline.cpp CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qlist/qlist.pro b/tests/benchmarks/corelib/tools/qlist/qlist.pro index d9ea71767b..bb69d7651d 100644 --- a/tests/benchmarks/corelib/tools/qlist/qlist.pro +++ b/tests/benchmarks/corelib/tools/qlist/qlist.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_qlist -QT = core +QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qrect/qrect.pro b/tests/benchmarks/corelib/tools/qrect/qrect.pro index 71a5c6cefe..b05483599e 100644 --- a/tests/benchmarks/corelib/tools/qrect/qrect.pro +++ b/tests/benchmarks/corelib/tools/qrect/qrect.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qrect DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index 5fcca00a29..b427150041 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qregexp DEPENDPATH += . INCLUDEPATH += . RESOURCES+=qregexp.qrc -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 33240aef8d..72300de9da 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qstring QT -= gui -QT += core-private +QT += core-private testlib SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp wince*:{ diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro index 07b96a9b08..fa4cbe3c13 100644 --- a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro +++ b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qstringbuilder QMAKE_CXXFLAGS += -g QMAKE_CFLAGS += -g -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index c7df0ac160..5803e7da0e 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qstringlist CONFIG -= debug CONFIG += release -QT -= gui +QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qvector/qvector.pro b/tests/benchmarks/corelib/tools/qvector/qvector.pro index c836027453..78a56adcd6 100644 --- a/tests/benchmarks/corelib/tools/qvector/qvector.pro +++ b/tests/benchmarks/corelib/tools/qvector/qvector.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_vector -QT = core +QT = core testlib INCLUDEPATH += . SOURCES += main.cpp outofline.cpp CONFIG += release -- cgit v1.2.3