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

tests: cleanup of test projects. Also, add rpathing where needed.

Browse Source
This commit is contained in:
Bill King
2011-04-07 11:13:30 +02:00
parent ca1b85cec7
commit 663af1e7e0
6 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/valgrind/callgrind/callgrindparsertests.pro
View File

@@ -1,20 +1,11 @@
include(../../../qtcreator.pri) include(../../auto/qttest.pri)
TEMPLATE = app include(../../../src/libs/valgrind/valgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
TARGET = callgrindparsertests TARGET = callgrindparsertests
macx:CONFIG -= app_bundle
QT += testlib network
DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
#enable extra debugging code #enable extra debugging code
DEFINES += "CALLGRINDPARSERTESTS" DEFINES += "CALLGRINDPARSERTESTS"
!win32 {
include(../../../src/libs/valgrind/valgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
}
SOURCES += callgrindparsertests.cpp SOURCES += callgrindparsertests.cpp
HEADERS += callgrindparsertests.h HEADERS += callgrindparsertests.h

8
tests/valgrind/callgrind/modeltest.pro
View File

@@ -1,13 +1,13 @@
include(../../../qtcreator.pri) include(../../../qtcreator.pri)
include(../../auto/qttestrpath.pri)
include($$IDE_SOURCE_TREE/src/plugins/callgrind/callgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
TEMPLATE = app TEMPLATE = app
TARGET = modeltest TARGET = modeltest
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
!win32 {
include($$IDE_SOURCE_TREE/src/plugins/callgrind/callgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
}
SRCDIR = $$IDE_SOURCE_TREE/src SRCDIR = $$IDE_SOURCE_TREE/src

9
tests/valgrind/memcheck/modeldemo.pro
View File

@@ -1,4 +1,8 @@
include(../../../qtcreator.pri) include(../../../qtcreator.pri)
include(../../auto/qttestrpath.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
TEMPLATE = app TEMPLATE = app
TARGET = modeldemo TARGET = modeldemo
@@ -8,11 +12,6 @@ QT += gui network
DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
!win32 {
include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
}
SOURCES += modeldemo.cpp SOURCES += modeldemo.cpp

25
tests/valgrind/memcheck/parsertests.pro
View File

@@ -1,21 +1,14 @@
include(../../../qtcreator.pri) include(../../auto/qttest.pri)
TEMPLATE = app
TARGET = parsertests
macx:CONFIG -= app_bundle
QT += testlib network
DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\""
!win32 {
include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
} include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
TARGET = parsertests
QT += network
DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\""
SOURCES += parsertests.cpp SOURCES += parsertests.cpp
HEADERS += parsertests.h HEADERS += parsertests.h

2
tests/valgrind/memcheck/testapps/uninit1/uninit1.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = uninit1 TARGET = uninit1
QT += core QT -= core gui
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle

18
tests/valgrind/memcheck/testrunner.pro
View File

@@ -1,20 +1,12 @@
include(../../../qtcreator.pri) include(../../auto/qttest.pri)
TEMPLATE = app include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
TARGET = testrunner TARGET = testrunner
macx:CONFIG -= app_bundle
QT += testlib network
DEFINES += "TESTRUNNER_SRC_DIR=\\\"$$_PRO_FILE_PWD_/testapps\\\"" DEFINES += "TESTRUNNER_SRC_DIR=\\\"$$_PRO_FILE_PWD_/testapps\\\""
DEFINES += "TESTRUNNER_APP_DIR=\\\"$(PWD)/testapps\\\"" DEFINES += "TESTRUNNER_APP_DIR=\\\"$(PWD)/testapps\\\""
!win32 {
include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
}
SOURCES += testrunner.cpp SOURCES += testrunner.cpp
HEADERS += testrunner.h HEADERS += testrunner.h