From 524a9ac4a8f9cbe5d961638c186e48fdb9502aed Mon Sep 17 00:00:00 2001 From: Bill King Date: Thu, 21 Oct 2010 14:49:58 +1000 Subject: [PATCH] tests: more test project cleanup --- tests/auto/aggregation/aggregation.pro | 4 +--- tests/auto/auto.pro | 1 - tests/auto/changeset/changeset.pro | 2 +- tests/auto/cplusplus/ast/ast.pro | 4 +--- .../auto/cplusplus/codeformatter/codeformatter.pro | 5 +---- tests/auto/cplusplus/codegen/codegen.pro | 5 +---- tests/auto/cplusplus/findusages/findusages.pro | 4 +--- tests/auto/cplusplus/lookup/lookup.pro | 4 +--- tests/auto/cplusplus/preprocessor/preprocessor.pro | 4 +--- tests/auto/cplusplus/semantic/semantic.pro | 4 +--- tests/auto/cplusplus/shared/shared.pri | 2 ++ .../typeprettyprinter/typeprettyprinter.pro | 4 +--- tests/auto/debugger/dumpers.pro | 2 +- tests/auto/debugger/gdb.pro | 4 +--- tests/auto/debugger/plugin.pro | 2 +- tests/auto/debugger/version.pro | 3 +-- tests/auto/fakevim/fakevim.pro | 2 +- .../highlighterengine/highlighterengine.pro | 2 +- .../specificrules/specificrules.pro | 2 +- tests/auto/qml/qmldesigner/coretests/coretests.pro | 4 ++-- .../qml/qmlprojectmanager/fileformat/fileformat.pro | 6 +----- tests/auto/qttest.pri | 13 +++++++++++++ tests/auto/utils_stringutils/utils_stringutils.pro | 4 +--- 23 files changed, 36 insertions(+), 51 deletions(-) create mode 100644 tests/auto/qttest.pri diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro index 30b1f7feb83..be0c4993025 100644 --- a/tests/auto/aggregation/aggregation.pro +++ b/tests/auto/aggregation/aggregation.pro @@ -1,6 +1,4 @@ -CONFIG += qtestlib testcase -TEMPLATE = app -CONFIG -= app_bundle +include(../qttest.pri) DEFINES += AGGREGATION_LIBRARY AGGREGATION_PATH = ../../../src/libs/aggregation diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ef1dd224e9a..6bbc96a66d7 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -9,7 +9,6 @@ SUBDIRS += \ generichighlighter \ # icheckbuild \ # profilewriter \ - qml \ utils_stringutils contains (QT_CONFIG, declarative) { diff --git a/tests/auto/changeset/changeset.pro b/tests/auto/changeset/changeset.pro index 8fb885d63f4..73ca8da423c 100644 --- a/tests/auto/changeset/changeset.pro +++ b/tests/auto/changeset/changeset.pro @@ -1,4 +1,4 @@ -CONFIG += qtestlib testcase +include(../qttest.pri) # Defines import symbol as empty DEFINES+=QTCREATOR_UTILS_STATIC_LIB diff --git a/tests/auto/cplusplus/ast/ast.pro b/tests/auto/cplusplus/ast/ast.pro index 5ee8e5f4b7c..48658149b56 100644 --- a/tests/auto/cplusplus/ast/ast.pro +++ b/tests/auto/cplusplus/ast/ast.pro @@ -1,6 +1,4 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase +include(../../qttest.pri) include(../shared/shared.pri) SOURCES += tst_ast.cpp diff --git a/tests/auto/cplusplus/codeformatter/codeformatter.pro b/tests/auto/cplusplus/codeformatter/codeformatter.pro index 0988517971c..892db0c693b 100644 --- a/tests/auto/cplusplus/codeformatter/codeformatter.pro +++ b/tests/auto/cplusplus/codeformatter/codeformatter.pro @@ -1,7 +1,4 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase - +include(../../qttest.pri) include(../shared/shared.pri) SRCDIR = ../../../../src diff --git a/tests/auto/cplusplus/codegen/codegen.pro b/tests/auto/cplusplus/codegen/codegen.pro index e4a3e13167c..6a56ec42d5f 100644 --- a/tests/auto/cplusplus/codegen/codegen.pro +++ b/tests/auto/cplusplus/codegen/codegen.pro @@ -1,7 +1,4 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase -CONFIG -= app_bundle +include(../../qttest.pri) include(../shared/shared.pri) INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins SOURCES += tst_codegen.cpp diff --git a/tests/auto/cplusplus/findusages/findusages.pro b/tests/auto/cplusplus/findusages/findusages.pro index f3f280a3e07..2643b848802 100644 --- a/tests/auto/cplusplus/findusages/findusages.pro +++ b/tests/auto/cplusplus/findusages/findusages.pro @@ -1,5 +1,3 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase +include(../../qttest.pri) include(../shared/shared.pri) SOURCES += tst_findusages.cpp diff --git a/tests/auto/cplusplus/lookup/lookup.pro b/tests/auto/cplusplus/lookup/lookup.pro index aed1edd2e29..d1eb14c6e6e 100644 --- a/tests/auto/cplusplus/lookup/lookup.pro +++ b/tests/auto/cplusplus/lookup/lookup.pro @@ -1,5 +1,3 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase +include(../../qttest.pri) include(../shared/shared.pri) SOURCES += tst_lookup.cpp diff --git a/tests/auto/cplusplus/preprocessor/preprocessor.pro b/tests/auto/cplusplus/preprocessor/preprocessor.pro index f471b511045..564c5b67caf 100644 --- a/tests/auto/cplusplus/preprocessor/preprocessor.pro +++ b/tests/auto/cplusplus/preprocessor/preprocessor.pro @@ -1,5 +1,3 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase +include(../../qttest.pri) include(../shared/shared.pri) SOURCES += tst_preprocessor.cpp diff --git a/tests/auto/cplusplus/semantic/semantic.pro b/tests/auto/cplusplus/semantic/semantic.pro index 84f613d5ab4..35f944950e3 100644 --- a/tests/auto/cplusplus/semantic/semantic.pro +++ b/tests/auto/cplusplus/semantic/semantic.pro @@ -1,5 +1,3 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase +include(../../qttest.pri) include(../shared/shared.pri) SOURCES += tst_semantic.cpp diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index c1542e68dd5..32ff527d768 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -3,4 +3,6 @@ include(../../../../qtcreator.pri) INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) +include($$IDE_SOURCE_TREE/src/rpath.pri) LIBS += -L$$IDE_PLUGIN_PATH/Nokia +DEFINES += Q_PLUGIN_PATH=\\\"$$IDE_PLUGIN_PATH/Nokia\\\" diff --git a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro index e28e54e991a..52cd07b60cd 100644 --- a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro +++ b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro @@ -1,5 +1,3 @@ -TEMPLATE = app -CONFIG += qt warn_on console depend_includepath -CONFIG += qtestlib testcase +include(../../qttest.pri) include(../shared/shared.pri) SOURCES += tst_typeprettyprinter.cpp diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro index 90a7689b0cd..92eb131535c 100644 --- a/tests/auto/debugger/dumpers.pro +++ b/tests/auto/debugger/dumpers.pro @@ -1,4 +1,4 @@ -CONFIG += qtestlib testcase +include(../qttest.pri) DEBUGGERDIR = ../../../src/plugins/debugger UTILSDIR = ../../../src/libs diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro index 1c3d9a0566b..d181290ad08 100644 --- a/tests/auto/debugger/gdb.pro +++ b/tests/auto/debugger/gdb.pro @@ -1,6 +1,4 @@ -CONFIG += qtestlib testcase - -QT -= gui +include(../qttest.pri) UTILSDIR = ../../../src/libs diff --git a/tests/auto/debugger/plugin.pro b/tests/auto/debugger/plugin.pro index e76cc454106..d1022b544f8 100644 --- a/tests/auto/debugger/plugin.pro +++ b/tests/auto/debugger/plugin.pro @@ -1,4 +1,4 @@ -CONFIG += qtestlib testcase +include(../qttest.pri) DEBUGGERDIR = ../../../src/plugins/debugger UTILSDIR = ../../../src/libs diff --git a/tests/auto/debugger/version.pro b/tests/auto/debugger/version.pro index 1730d9ddd1f..f5b1cdd726a 100644 --- a/tests/auto/debugger/version.pro +++ b/tests/auto/debugger/version.pro @@ -1,5 +1,4 @@ -CONFIG += qtestlib testcase -QT -= gui +include(../qttest.pri) UTILSDIR = ../../../src/libs diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro index 012f472d4a4..35b9e32fe09 100644 --- a/tests/auto/fakevim/fakevim.pro +++ b/tests/auto/fakevim/fakevim.pro @@ -1,4 +1,4 @@ -CONFIG += qtestlib testcase +include(../qttest.pri) # Defines import symbol as empty DEFINES+=QTCREATOR_UTILS_STATIC_LIB diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro index 80991e37d41..8121e174cf0 100644 --- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro +++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro @@ -1,5 +1,5 @@ +include(../../qttest.pri) QT += gui -CONFIG += qtestlib testcase PLUGINSDIR = ../../../../src/plugins GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter diff --git a/tests/auto/generichighlighter/specificrules/specificrules.pro b/tests/auto/generichighlighter/specificrules/specificrules.pro index db8f5e00832..eea2d409e16 100644 --- a/tests/auto/generichighlighter/specificrules/specificrules.pro +++ b/tests/auto/generichighlighter/specificrules/specificrules.pro @@ -1,4 +1,4 @@ -CONFIG += qtestlib testcase +include(../../qttest.pri) PLUGINSDIR = ../../../../src/plugins diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index 5455055713c..d5ba02220f5 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -1,3 +1,5 @@ +include(../../../qttest.pri) + include(../../../../../qtcreator.pri) include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) @@ -6,8 +8,6 @@ QT += script \ declarative \ webkit -CONFIG += qtestlib testcase - # DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB DEFINES+=QTCREATORDIR=\\\"$$IDE_BUILD_TREE\\\" DEFINES+=QT_CREATOR QTCREATOR_TEST diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro index cedfbcdb221..ec195534d9c 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro +++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro @@ -1,8 +1,4 @@ -TEMPLATE = app - -CONFIG += qt warn_on console depend_includepath -CONFIG -= app_bundle -CONFIG += qtestlib testcase +include(../../../qttest.pri) QT += script \ declarative diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri new file mode 100644 index 00000000000..23e44ef21d5 --- /dev/null +++ b/tests/auto/qttest.pri @@ -0,0 +1,13 @@ +isEmpty(TEMPLATE):TEMPLATE=app +CONFIG += qt warn_on console depend_includepath testcase qtestlib +CONFIG -= app_bundle + +symbian:{ + TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 +# DEFINES += QTEST_NO_SPECIALIZATIONS + TARGET.CAPABILITY="None" + RSS_RULES ="group_name=\"QtTests\";" +} + +# prefix test binary with tst_ +!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") diff --git a/tests/auto/utils_stringutils/utils_stringutils.pro b/tests/auto/utils_stringutils/utils_stringutils.pro index ecc61026583..d31b014dc21 100644 --- a/tests/auto/utils_stringutils/utils_stringutils.pro +++ b/tests/auto/utils_stringutils/utils_stringutils.pro @@ -1,6 +1,4 @@ -CONFIG += qtestlib testcase -TEMPLATE = app -CONFIG -= app_bundle +include(../qttest.pri) DEFINES += QTCREATOR_UTILS_LIB UTILS_PATH = ../../../src/libs/utils