tests: more test project cleanup

2010-10-21 14:49:58 +10:00
parent a1664c12e9
commit 524a9ac4a8
23 changed files with 36 additions and 51 deletions
--- 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
--- 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) {
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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\\\"
--- 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
--- 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
--- 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

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

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

--- 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
--- 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
--- a/tests/auto/qttest.pri
+++ 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_")
--- 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