Tests: More autotest cleanup.

18 files changed, 61 insertions, 129 deletions

diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro
index be0c499302..5e58d7e57c 100644
--- a/tests/auto/aggregation/aggregation.pro
+++ b/tests/auto/aggregation/aggregation.pro
@@ -1,11 +1,4 @@
 include(../qttest.pri)
-DEFINES += AGGREGATION_LIBRARY
-
-AGGREGATION_PATH = ../../../src/libs/aggregation
-
-INCLUDEPATH += $$AGGREGATION_PATH
-# Input
-SOURCES += tst_aggregate.cpp \
-    $$AGGREGATION_PATH/aggregate.cpp
-HEADERS += $$AGGREGATION_PATH/aggregate.h \
-    $$AGGREGATION_PATH/aggregation_global.h
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/aggregation
+include($$IDE_SOURCE_TREE/src/libs/aggregation/aggregation.pri)
+SOURCES += tst_aggregate.cpp
diff --git a/tests/auto/changeset/changeset.pro b/tests/auto/changeset/changeset.pro
index 73ca8da423..19afe27926 100644
--- a/tests/auto/changeset/changeset.pro
+++ b/tests/auto/changeset/changeset.pro
@@ -1,15 +1,5 @@
 include(../qttest.pri)
 
-# Defines import symbol as empty
-DEFINES+=QTCREATOR_UTILS_STATIC_LIB
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
-UTILSDIR = ../../../src/libs
-
-SOURCES += \
-	tst_changeset.cpp \
-	$$UTILSDIR/utils/changeset.cpp
-
-HEADERS += \
-	$$UTILSDIR/utils/changeset.h
-
-INCLUDEPATH += $$UTILSDIR
+SOURCES += tst_changeset.cpp
diff --git a/tests/auto/cplusplus/codeformatter/codeformatter.pro b/tests/auto/cplusplus/codeformatter/codeformatter.pro
index e97b551231..37057eef99 100644
--- a/tests/auto/cplusplus/codeformatter/codeformatter.pro
+++ b/tests/auto/cplusplus/codeformatter/codeformatter.pro
@@ -1,8 +1,6 @@
 include(../../qttest.pri)
 include(../shared/shared.pri)
 
-SRCDIR = ../../../../src
-
 SOURCES += tst_codeformatter.cpp
 
-INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins $$IDE_SOURCE_TREE/src/libs
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index c55a43a6ce..7481f13f85 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -1,8 +1,8 @@
 include(../qttest.pri)
 
-DEBUGGERDIR = ../../../src/plugins/debugger
-UTILSDIR    = ../../../src/libs
-MACROSDIR   = ../../../share/qtcreator/gdbmacros
+DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
+UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
+MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
 
 SOURCES += \
     $$DEBUGGERDIR/gdb/gdbmi.cpp \
@@ -11,6 +11,7 @@ SOURCES += \
     tst_dumpers.cpp \
 
 DEFINES += MACROSDEBUG
+
 win32:DEFINES += _CRT_SECURE_NO_WARNINGS
 
 DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index d181290ad0..bbf3bb4d5f 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -1,8 +1,8 @@
 include(../qttest.pri)
 
-UTILSDIR    = ../../../src/libs
+UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
 
-DEBUGGERDIR = ../../../src/plugins/debugger
+DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
 
 INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
 
diff --git a/tests/auto/debugger/plugin.pro b/tests/auto/debugger/plugin.pro
index d1022b544f..930eab89f7 100644
--- a/tests/auto/debugger/plugin.pro
+++ b/tests/auto/debugger/plugin.pro
@@ -1,8 +1,8 @@
 include(../qttest.pri)
 
-DEBUGGERDIR = ../../../src/plugins/debugger
-UTILSDIR    = ../../../src/libs
-MACROSDIR   = ../../../share/qtcreator/gdbmacros
+DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
+UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
+MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
 
 SOURCES += \
     tst_plugin.cpp \
diff --git a/tests/auto/debugger/tst_plugin.cpp b/tests/auto/debugger/tst_plugin.cpp
index 653d66374d..635b7e7ff0 100644
--- a/tests/auto/debugger/tst_plugin.cpp
+++ b/tests/auto/debugger/tst_plugin.cpp
@@ -84,6 +84,7 @@ void tst_Plugin::readStandardError()
 void tst_Plugin::runQtc()
 {
     QString test = QFileInfo(qApp->arguments().at(0)).absoluteFilePath();
+    // FIXME: this is utterly broken...
     QString qtc = QFileInfo(test).absolutePath() + "/../../../bin/qtcreator.bin";
     qtc = QFileInfo(qtc).absoluteFilePath();
     QStringList env = QProcess::systemEnvironment();
diff --git a/tests/auto/debugger/version.pro b/tests/auto/debugger/version.pro
index f5b1cdd726..d405805392 100644
--- a/tests/auto/debugger/version.pro
+++ b/tests/auto/debugger/version.pro
@@ -1,8 +1,7 @@
 include(../qttest.pri)
 
-UTILSDIR    = ../../../src/libs
-
-DEBUGGERDIR = ../../../src/plugins/debugger
+UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
+DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
 
 INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
 
diff --git a/tests/auto/environment/environment.pro b/tests/auto/environment/environment.pro
index a39d91d66a..b1c78cc121 100644
--- a/tests/auto/environment/environment.pro
+++ b/tests/auto/environment/environment.pro
@@ -1,17 +1,4 @@
-CONFIG += qtestlib testcase
-TEMPLATE = app
-CONFIG -= app_bundle
-DEFINES += QTCREATOR_UTILS_LIB
+include(../qttest.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
-UTILS_PATH = ../../../src/libs/utils
-
-INCLUDEPATH += $$UTILS_PATH/..
-
-SOURCES += \
-    tst_environment.cpp \
-    $$UTILS_PATH/environment.cpp
-HEADERS += \
-    $$UTILS_PATH/environment.h \
-    $$UTILS_PATH/utils_global.h
-
-TARGET = tst_$$TARGET
+SOURCES += tst_environment.cpp
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 8a63bc7c43..95ddc0ff4d 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,12 +1,9 @@
 include(../qttest.pri)
 
-# Defines import symbol as empty
-DEFINES+=QTCREATOR_UTILS_STATIC_LIB
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
-include(../../../src/libs/utils/utils.pri)
-
-FAKEVIMDIR = ../../../src/plugins/fakevim
-UTILSDIR = ../../../src/libs
+FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
+UTILSDIR = $$IDE_SOURCE_TREE/src/libs
 
 SOURCES += \
         $$FAKEVIMDIR/fakevimhandler.cpp \
diff --git a/tests/auto/filesearch/filesearch.pro b/tests/auto/filesearch/filesearch.pro
index 251541fc63..b8759f8645 100644
--- a/tests/auto/filesearch/filesearch.pro
+++ b/tests/auto/filesearch/filesearch.pro
@@ -1,22 +1,11 @@
-CONFIG += qtestlib testcase
-TEMPLATE = app
-CONFIG -= app_bundle
-DEFINES += QTCREATOR_UTILS_LIB
+include(../qttest.pri)
 
-include(../../../qtcreator.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
-UTILS_PATH = $$IDE_SOURCE_TREE/src/libs/utils
-
-INCLUDEPATH += $$UTILS_PATH
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
 # Input
-SOURCES += tst_filesearch.cpp \
-    $$UTILS_PATH/filesearch.cpp
-HEADERS += $$UTILS_PATH/filesearch.h \
-    $$UTILS_PATH/utils_global.h
-
-TARGET=tst_$$TARGET
+SOURCES += tst_filesearch.cpp
 
 OTHER_FILES += testfile.txt
 
-RESOURCES += \
-    tst_filesearch.qrc
+RESOURCES += tst_filesearch.qrc
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
index 8121e174cf..d2302a9b03 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
@@ -1,7 +1,7 @@
 include(../../qttest.pri)
 QT += gui
 
-PLUGINSDIR = ../../../../src/plugins
+PLUGINSDIR = $$IDE_SOURCE_TREE/src/plugins
 GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
 
 SOURCES += \
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.pro b/tests/auto/generichighlighter/specificrules/specificrules.pro
index eea2d409e1..be74ac85b3 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.pro
+++ b/tests/auto/generichighlighter/specificrules/specificrules.pro
@@ -1,15 +1,16 @@
 include(../../qttest.pri)
 
-PLUGINSDIR = ../../../../src/plugins
+PLUGINSDIR = $$IDE_SOURCE_TREE/src/plugins
+GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
 
 SOURCES += tst_specificrules.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/context.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/dynamicrule.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/rule.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/specificrules.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/progressdata.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/highlightdefinition.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/keywordlist.cpp \
-    $$PLUGINSDIR/texteditor/generichighlighter/itemdata.cpp
+    $$GENERICHIGHLIGHTERDIR/context.cpp \
+    $$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \
+    $$GENERICHIGHLIGHTERDIR/rule.cpp \
+    $$GENERICHIGHLIGHTERDIR/specificrules.cpp \
+    $$GENERICHIGHLIGHTERDIR/progressdata.cpp \
+    $$GENERICHIGHLIGHTERDIR/highlightdefinition.cpp \
+    $$GENERICHIGHLIGHTERDIR/keywordlist.cpp \
+    $$GENERICHIGHLIGHTERDIR/itemdata.cpp
 
 INCLUDEPATH += $$PLUGINSDIR
diff --git a/tests/auto/ioutils/ioutils.pro b/tests/auto/ioutils/ioutils.pro
index dfeb477134..a4b2b5787f 100644
--- a/tests/auto/ioutils/ioutils.pro
+++ b/tests/auto/ioutils/ioutils.pro
@@ -1,13 +1,5 @@
-CONFIG += qtestlib testcase
-TEMPLATE = app
-CONFIG -= app_bundle
+include(../qttest.pri)
 
-UTILS_PATH = ../../../src/shared/proparser
-
-INCLUDEPATH += $$UTILS_PATH
-DEPENDPATH += $$UTILS_PATH
-
-SOURCES += \
-    tst_ioutils.cpp
-
-TARGET = tst_$$TARGET
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared
+SOURCES += tst_ioutils.cpp \
+    $$IDE_SOURCE_TREE/src/shared/proparser/ioutils.cpp
diff --git a/tests/auto/ioutils/tst_ioutils.cpp b/tests/auto/ioutils/tst_ioutils.cpp
index 618321b18f..180c4bdb0a 100644
--- a/tests/auto/ioutils/tst_ioutils.cpp
+++ b/tests/auto/ioutils/tst_ioutils.cpp
@@ -31,9 +31,9 @@
 **
 **************************************************************************/
 
-#include "../../../src/shared/proparser/ioutils.cpp"
-
 #include <QtTest/QtTest>
+#include <proparser/ioutils.h>
+
 
 class tst_IoUtils : public QObject
 {
@@ -79,7 +79,7 @@ void tst_IoUtils::quoteArg()
     QFETCH(QString, in);
     QFETCH(QString, out);
 
-    QCOMPARE(IoUtils::shellQuote(in), out);
+    QCOMPARE(ProFileEvaluatorInternal::IoUtils::shellQuote(in), out);
 }
 
 QTEST_MAIN(tst_IoUtils)
diff --git a/tests/auto/qtcprocess/qtcprocess.pro b/tests/auto/qtcprocess/qtcprocess.pro
index 02e76ae9f5..7b06b64cd8 100644
--- a/tests/auto/qtcprocess/qtcprocess.pro
+++ b/tests/auto/qtcprocess/qtcprocess.pro
@@ -1,24 +1,9 @@
-CONFIG += qtestlib testcase
-TEMPLATE = app
-CONFIG -= app_bundle
-DEFINES += QTCREATOR_UTILS_LIB
+include(../qttest.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 win32:DEFINES += _CRT_SECURE_NO_WARNINGS
 
-UTILS_PATH = ../../../src/libs/utils
+SOURCES +=  tst_qtcprocess.cpp 
 
-INCLUDEPATH += $$UTILS_PATH/..
-DEPENDPATH += $$UTILS_PATH/..
-
-SOURCES += \
-    tst_qtcprocess.cpp \
-    $$UTILS_PATH/qtcprocess.cpp \
-    $$UTILS_PATH/stringutils.cpp \
-    $$UTILS_PATH/environment.cpp
-HEADERS += \
-    $$UTILS_PATH/qtcprocess.h \
-    $$UTILS_PATH/environment.h \
-    $$UTILS_PATH/stringutils.h \
-    $$UTILS_PATH/utils_global.h
-
-TARGET = tst_$$TARGET
+DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
+DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
diff --git a/tests/auto/utils_stringutils/utils_stringutils.pro b/tests/auto/utils_stringutils/utils_stringutils.pro
index 41a576f5da..b1bb63cf3a 100644
--- a/tests/auto/utils_stringutils/utils_stringutils.pro
+++ b/tests/auto/utils_stringutils/utils_stringutils.pro
@@ -1,13 +1,11 @@
 include(../qttest.pri)
-DEFINES += QTCREATOR_UTILS_LIB
-
-UTILS_PATH = ../../../src/libs/utils
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
 
-INCLUDEPATH += $$UTILS_PATH
-# Input
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
 SOURCES += tst_stringutils.cpp \
-    $$UTILS_PATH/stringutils.cpp
-HEADERS += $$UTILS_PATH/stringutils.h \
-    $$UTILS_PATH/utils_global.h
+#    $$UTILS_PATH/stringutils.cpp
+
+#HEADERS += $$UTILS_PATH/stringutils.h \
+#    $$UTILS_PATH/utils_global.h
diff --git a/tests/manual/gdbdebugger/helper/helper.pro b/tests/manual/gdbdebugger/helper/helper.pro
index 57e1272b65..3812ecfa5e 100644
--- a/tests/manual/gdbdebugger/helper/helper.pro
+++ b/tests/manual/gdbdebugger/helper/helper.pro
@@ -1,5 +1,6 @@
-
+include(../../../../qtcreator.pri)
 TEMPLATE = app
 
-SOURCES += ../../../../share/qtcreator/gdbmacros/gdbmacros.cpp
+win32:DEFINES += _CRT_SECURE_NO_WARNINGS
+SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros/gdbmacros.cpp
 SOURCES += main.cpp