feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tests: More autotest cleanup.

Browse Source
This commit is contained in:
Bill King
2011-02-16 13:01:58 +01:00
parent f6b2433320
commit 36c72ac388
18 changed files with 61 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/aggregation/aggregation.pro
+3 -10
View File
@@ -1,11 +1,4 @@
include(../qttest.pri) include(../qttest.pri)
DEFINES += AGGREGATION_LIBRARY INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/aggregation
include($$IDE_SOURCE_TREE/src/libs/aggregation/aggregation.pri)
AGGREGATION_PATH = ../../../src/libs/aggregation SOURCES += tst_aggregate.cpp
INCLUDEPATH += $$AGGREGATION_PATH
# Input
SOURCES += tst_aggregate.cpp \
$$AGGREGATION_PATH/aggregate.cpp
HEADERS += $$AGGREGATION_PATH/aggregate.h \
$$AGGREGATION_PATH/aggregation_global.h
tests/auto/changeset/changeset.pro
+2 -12
View File
@@ -1,15 +1,5 @@
include(../qttest.pri) include(../qttest.pri)
# Defines import symbol as empty include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
DEFINES+=QTCREATOR_UTILS_STATIC_LIB
UTILSDIR = ../../../src/libs SOURCES += tst_changeset.cpp
SOURCES += \
tst_changeset.cpp \
$$UTILSDIR/utils/changeset.cpp
HEADERS += \
$$UTILSDIR/utils/changeset.h
INCLUDEPATH += $$UTILSDIR
tests/auto/cplusplus/codeformatter/codeformatter.pro
+1 -3
View File
@@ -1,8 +1,6 @@
include(../../qttest.pri) include(../../qttest.pri)
include(../shared/shared.pri) include(../shared/shared.pri)
SRCDIR = ../../../../src
SOURCES += tst_codeformatter.cpp SOURCES += tst_codeformatter.cpp
INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins $$IDE_SOURCE_TREE/src/libs
tests/auto/debugger/dumpers.pro
+4 -3
View File
@@ -1,8 +1,8 @@
include(../qttest.pri) include(../qttest.pri)
DEBUGGERDIR = ../../../src/plugins/debugger DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
UTILSDIR = ../../../src/libs UTILSDIR = $$IDE_SOURCE_TREE/src/libs
MACROSDIR = ../../../share/qtcreator/gdbmacros MACROSDIR = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
SOURCES += \ SOURCES += \
$$DEBUGGERDIR/gdb/gdbmi.cpp \ $$DEBUGGERDIR/gdb/gdbmi.cpp \
@@ -11,6 +11,7 @@ SOURCES += \
tst_dumpers.cpp \ tst_dumpers.cpp \
DEFINES += MACROSDEBUG DEFINES += MACROSDEBUG
win32:DEFINES += _CRT_SECURE_NO_WARNINGS win32:DEFINES += _CRT_SECURE_NO_WARNINGS
DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
tests/auto/debugger/gdb.pro
+2 -2
View File
@@ -1,8 +1,8 @@
include(../qttest.pri) 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 INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
tests/auto/debugger/plugin.pro
+3 -3
View File
@@ -1,8 +1,8 @@
include(../qttest.pri) include(../qttest.pri)
DEBUGGERDIR = ../../../src/plugins/debugger DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
UTILSDIR = ../../../src/libs UTILSDIR = $$IDE_SOURCE_TREE/src/libs
MACROSDIR = ../../../share/qtcreator/gdbmacros MACROSDIR = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
SOURCES += \ SOURCES += \
tst_plugin.cpp \ tst_plugin.cpp \
tests/auto/debugger/tst_plugin.cpp
+1
View File
@@ -84,6 +84,7 @@ void tst_Plugin::readStandardError()
void tst_Plugin::runQtc() void tst_Plugin::runQtc()
{ {
QString test = QFileInfo(qApp->arguments().at(0)).absoluteFilePath(); QString test = QFileInfo(qApp->arguments().at(0)).absoluteFilePath();
// FIXME: this is utterly broken...
QString qtc = QFileInfo(test).absolutePath() + "/../../../bin/qtcreator.bin"; QString qtc = QFileInfo(test).absolutePath() + "/../../../bin/qtcreator.bin";
qtc = QFileInfo(qtc).absoluteFilePath(); qtc = QFileInfo(qtc).absoluteFilePath();
QStringList env = QProcess::systemEnvironment(); QStringList env = QProcess::systemEnvironment();
tests/auto/debugger/version.pro
+2 -3
View File
@@ -1,8 +1,7 @@
include(../qttest.pri) include(../qttest.pri)
UTILSDIR = ../../../src/libs UTILSDIR = $$IDE_SOURCE_TREE/src/libs
DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
DEBUGGERDIR = ../../../src/plugins/debugger
INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
tests/auto/environment/environment.pro
+3 -16
View File
@@ -1,17 +1,4 @@
CONFIG += qtestlib testcase include(../qttest.pri)
TEMPLATE = app include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
CONFIG -= app_bundle
DEFINES += QTCREATOR_UTILS_LIB
UTILS_PATH = ../../../src/libs/utils SOURCES += tst_environment.cpp
INCLUDEPATH += $$UTILS_PATH/..
SOURCES += \
tst_environment.cpp \
$$UTILS_PATH/environment.cpp
HEADERS += \
$$UTILS_PATH/environment.h \
$$UTILS_PATH/utils_global.h
TARGET = tst_$$TARGET
tests/auto/fakevim/fakevim.pro
+3 -6
View File
@@ -1,12 +1,9 @@
include(../qttest.pri) include(../qttest.pri)
# Defines import symbol as empty include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
DEFINES+=QTCREATOR_UTILS_STATIC_LIB
include(../../../src/libs/utils/utils.pri) FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
UTILSDIR = $$IDE_SOURCE_TREE/src/libs
FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs
SOURCES += \ SOURCES += \
$$FAKEVIMDIR/fakevimhandler.cpp \ $$FAKEVIMDIR/fakevimhandler.cpp \
tests/auto/filesearch/filesearch.pro
+5 -16
View File
@@ -1,22 +1,11 @@
CONFIG += qtestlib testcase include(../qttest.pri)
TEMPLATE = app
CONFIG -= app_bundle
DEFINES += QTCREATOR_UTILS_LIB
include(../../../qtcreator.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
UTILS_PATH = $$IDE_SOURCE_TREE/src/libs/utils INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
INCLUDEPATH += $$UTILS_PATH
# Input # Input
SOURCES += tst_filesearch.cpp \ SOURCES += tst_filesearch.cpp
$$UTILS_PATH/filesearch.cpp
HEADERS += $$UTILS_PATH/filesearch.h \
$$UTILS_PATH/utils_global.h
TARGET=tst_$$TARGET
OTHER_FILES += testfile.txt OTHER_FILES += testfile.txt
RESOURCES += \ RESOURCES += tst_filesearch.qrc
tst_filesearch.qrc
tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
+1 -1
View File
@@ -1,7 +1,7 @@
include(../../qttest.pri) include(../../qttest.pri)
QT += gui QT += gui
PLUGINSDIR = ../../../../src/plugins PLUGINSDIR = $$IDE_SOURCE_TREE/src/plugins
GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
SOURCES += \ SOURCES += \
tests/auto/generichighlighter/specificrules/specificrules.pro
+10 -9
View File
@@ -1,15 +1,16 @@
include(../../qttest.pri) include(../../qttest.pri)
PLUGINSDIR = ../../../../src/plugins PLUGINSDIR = $$IDE_SOURCE_TREE/src/plugins
GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
SOURCES += tst_specificrules.cpp \ SOURCES += tst_specificrules.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/context.cpp \ $$GENERICHIGHLIGHTERDIR/context.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/dynamicrule.cpp \ $$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/rule.cpp \ $$GENERICHIGHLIGHTERDIR/rule.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/specificrules.cpp \ $$GENERICHIGHLIGHTERDIR/specificrules.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/progressdata.cpp \ $$GENERICHIGHLIGHTERDIR/progressdata.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/highlightdefinition.cpp \ $$GENERICHIGHLIGHTERDIR/highlightdefinition.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/keywordlist.cpp \ $$GENERICHIGHLIGHTERDIR/keywordlist.cpp \
$$PLUGINSDIR/texteditor/generichighlighter/itemdata.cpp $$GENERICHIGHLIGHTERDIR/itemdata.cpp
INCLUDEPATH += $$PLUGINSDIR INCLUDEPATH += $$PLUGINSDIR
tests/auto/ioutils/ioutils.pro
+4 -12
View File
@@ -1,13 +1,5 @@
CONFIG += qtestlib testcase include(../qttest.pri)
TEMPLATE = app
CONFIG -= app_bundle
UTILS_PATH = ../../../src/shared/proparser INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared
SOURCES += tst_ioutils.cpp \
INCLUDEPATH += $$UTILS_PATH $$IDE_SOURCE_TREE/src/shared/proparser/ioutils.cpp
DEPENDPATH += $$UTILS_PATH
SOURCES += \
tst_ioutils.cpp
TARGET = tst_$$TARGET
tests/auto/ioutils/tst_ioutils.cpp
+3 -3
View File
@@ -31,9 +31,9 @@
** **
**************************************************************************/ **************************************************************************/
#include "../../../src/shared/proparser/ioutils.cpp"
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <proparser/ioutils.h>
class tst_IoUtils : public QObject class tst_IoUtils : public QObject
{ {
@@ -79,7 +79,7 @@ void tst_IoUtils::quoteArg()
QFETCH(QString, in); QFETCH(QString, in);
QFETCH(QString, out); QFETCH(QString, out);
QCOMPARE(IoUtils::shellQuote(in), out); QCOMPARE(ProFileEvaluatorInternal::IoUtils::shellQuote(in), out);
} }
QTEST_MAIN(tst_IoUtils) QTEST_MAIN(tst_IoUtils)
tests/auto/qtcprocess/qtcprocess.pro
+5 -20
View File
@@ -1,24 +1,9 @@
CONFIG += qtestlib testcase include(../qttest.pri)
TEMPLATE = app include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
CONFIG -= app_bundle
DEFINES += QTCREATOR_UTILS_LIB
win32:DEFINES += _CRT_SECURE_NO_WARNINGS win32:DEFINES += _CRT_SECURE_NO_WARNINGS
UTILS_PATH = ../../../src/libs/utils SOURCES += tst_qtcprocess.cpp
INCLUDEPATH += $$UTILS_PATH/.. DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
DEPENDPATH += $$UTILS_PATH/.. DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
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
tests/auto/utils_stringutils/utils_stringutils.pro
+6 -8
View File
@@ -1,13 +1,11 @@
include(../qttest.pri) include(../qttest.pri)
DEFINES += QTCREATOR_UTILS_LIB include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
UTILS_PATH = ../../../src/libs/utils
DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
INCLUDEPATH += $$UTILS_PATH INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
# Input
SOURCES += tst_stringutils.cpp \ SOURCES += tst_stringutils.cpp \
$$UTILS_PATH/stringutils.cpp # $$UTILS_PATH/stringutils.cpp
HEADERS += $$UTILS_PATH/stringutils.h \
$$UTILS_PATH/utils_global.h #HEADERS += $$UTILS_PATH/stringutils.h \
# $$UTILS_PATH/utils_global.h
tests/manual/gdbdebugger/helper/helper.pro
+3 -2
View File
@@ -1,5 +1,6 @@
include(../../../../qtcreator.pri)
TEMPLATE = app 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 SOURCES += main.cpp