From f823c4810e3f544df2440db0c0e1966b6f197f4b Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Tue, 13 Jul 2010 11:59:37 +1000
Subject: [PATCH] Add "make check" support to testcase makefiles.
---
tests/auto/aggregation/aggregation.pro | 2 +-
tests/auto/changeset/changeset.pro | 3 +--
tests/auto/cplusplus/ast/ast.pro | 2 +-
tests/auto/cplusplus/codeformatter/codeformatter.pro | 2 +-
tests/auto/cplusplus/findusages/findusages.pro | 2 +-
tests/auto/cplusplus/lookup/lookup.pro | 2 +-
tests/auto/cplusplus/preprocessor/preprocessor.pro | 2 +-
tests/auto/cplusplus/semantic/semantic.pro | 2 +-
tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro | 2 +-
tests/auto/debugger/dumpers.pro | 2 +-
tests/auto/debugger/gdb.pro | 2 +-
tests/auto/debugger/plugin.pro | 3 +--
tests/auto/debugger/version.pro | 2 +-
tests/auto/fakevim/fakevim.pro | 3 +--
.../highlighterengine/highlighterengine.pro | 3 ++-
.../auto/generichighlighter/specificrules/specificrules.pro | 2 +-
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro | 2 +-
tests/auto/qml/qmldesigner/coretests/coretests.pro | 5 +++--
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro | 4 ++--
19 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro
index ca1d1205a35..ae45e5f9d68 100644
--- a/tests/auto/aggregation/aggregation.pro
+++ b/tests/auto/aggregation/aggregation.pro
@@ -1,4 +1,4 @@
-CONFIG += qtestlib
+CONFIG += qtestlib testcase
TEMPLATE = app
CONFIG -= app_bundle
DEFINES += AGGREGATION_LIBRARY
diff --git a/tests/auto/changeset/changeset.pro b/tests/auto/changeset/changeset.pro
index 5aa2358a65b..0d2522e8804 100644
--- a/tests/auto/changeset/changeset.pro
+++ b/tests/auto/changeset/changeset.pro
@@ -1,5 +1,4 @@
-
-QT += testlib
+CONFIG += qtestlib testcase
# 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 05435839c6c..13f11c7e2e2 100644
--- a/tests/auto/cplusplus/ast/ast.pro
+++ b/tests/auto/cplusplus/ast/ast.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_ast.cpp
TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/codeformatter/codeformatter.pro b/tests/auto/cplusplus/codeformatter/codeformatter.pro
index de80180f9f6..6ebd7722237 100644
--- a/tests/auto/cplusplus/codeformatter/codeformatter.pro
+++ b/tests/auto/cplusplus/codeformatter/codeformatter.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
include(../shared/shared.pri)
diff --git a/tests/auto/cplusplus/findusages/findusages.pro b/tests/auto/cplusplus/findusages/findusages.pro
index c3e38b6674a..c6176617884 100644
--- a/tests/auto/cplusplus/findusages/findusages.pro
+++ b/tests/auto/cplusplus/findusages/findusages.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_findusages.cpp
TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/lookup/lookup.pro b/tests/auto/cplusplus/lookup/lookup.pro
index 9011a33f612..60aadad47e6 100644
--- a/tests/auto/cplusplus/lookup/lookup.pro
+++ b/tests/auto/cplusplus/lookup/lookup.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_lookup.cpp
TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/preprocessor/preprocessor.pro b/tests/auto/cplusplus/preprocessor/preprocessor.pro
index bc7c98ea4ea..6e4af547bb4 100644
--- a/tests/auto/cplusplus/preprocessor/preprocessor.pro
+++ b/tests/auto/cplusplus/preprocessor/preprocessor.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
TARGET = tst_$$TARGET
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 2198ab78c73..23a18cf37b9 100644
--- a/tests/auto/cplusplus/semantic/semantic.pro
+++ b/tests/auto/cplusplus/semantic/semantic.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_semantic.cpp
diff --git a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
index f9b35bba719..2e884365c1f 100644
--- a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
+++ b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
include(../shared/shared.pri)
SOURCES += tst_typeprettyprinter.cpp
TARGET=tst_$$TARGET
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 201c36cb436..8ba21aa0172 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
DEBUGGERDIR = ../../../src/plugins/debugger
UTILSDIR = ../../../src/libs
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index d455843aa73..d4b7503a789 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
QT -= gui
diff --git a/tests/auto/debugger/plugin.pro b/tests/auto/debugger/plugin.pro
index 7cc42dac750..53936e2349f 100644
--- a/tests/auto/debugger/plugin.pro
+++ b/tests/auto/debugger/plugin.pro
@@ -1,5 +1,4 @@
-QT += testlib
-
+CONFIG += qtestlib testcase
DEBUGGERDIR = ../../../src/plugins/debugger
UTILSDIR = ../../../src/libs
diff --git a/tests/auto/debugger/version.pro b/tests/auto/debugger/version.pro
index 78d3f0f77c5..9e8069c07db 100644
--- a/tests/auto/debugger/version.pro
+++ b/tests/auto/debugger/version.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
QT -= gui
UTILSDIR = ../../../src/libs
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index aef6b9ce30d..6d119a97034 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,5 +1,4 @@
-
-QT += testlib
+CONFIG += qtestlib testcase
# 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 e8e65085daa..1342b49e6e0 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
@@ -1,4 +1,5 @@
-QT += gui testlib
+QT += gui
+CONFIG += qtestlib testcase
PLUGINSDIR = ../../../../src/plugins
TEXTEDITORDIR = $$PLUGINSDIR/texteditor
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.pro b/tests/auto/generichighlighter/specificrules/specificrules.pro
index 889ff8a7376..374456b33cc 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.pro
+++ b/tests/auto/generichighlighter/specificrules/specificrules.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
PLUGINSDIR = ../../../../src/plugins
diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
index 713ef373b63..886207cc691 100644
--- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
+++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
@@ -1,6 +1,6 @@
include(../../../../../qtcreator.pri)
#include(../../../../../src/plugins/qmldesigner/config.pri)
-QT += testlib
+CONFIG += qtestlib testcase
##DEFINES += DONT_MESS_WITH_QDEBUG
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 2aa0380e74c..45e6cbf35b0 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -2,10 +2,11 @@ include(../../../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
-QT += testlib \
- script \
+QT += script \
declarative
+CONFIG += qtestlib testcase
+
# DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
DEFINES+=QTCREATORDIR=\\\"$$CREATORDIR\\\"
DEFINES+=QT_CREATOR QTCREATOR_TEST
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
index b4b4577d86b..650c12a68a1 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
@@ -2,9 +2,9 @@ TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
CONFIG -= app_bundle
+CONFIG += qtestlib testcase
-QT += testlib \
- script \
+QT += script \
declarative
PLUGIN_DIR=../../../../../src/plugins/qmlprojectmanager
--
GitLab