diff options
author | Bill King <bill.king@nokia.com> | 2011-04-07 11:13:30 +0200 |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2011-04-07 11:13:54 +0200 |
commit | 663af1e7e0712e5e1d0ac3a334395ede1acd6dcf (patch) | |
tree | a8fbf3d685fb0be74f4a519002158331b6c4e52c /tests/valgrind | |
parent | ca1b85cec737afaed07d039fd36259a93736ddbe (diff) | |
download | qt-creator-663af1e7e0712e5e1d0ac3a334395ede1acd6dcf.tar.gz |
tests: cleanup of test projects. Also, add rpathing where needed.
Diffstat (limited to 'tests/valgrind')
-rw-r--r-- | tests/valgrind/callgrind/callgrindparsertests.pro | 15 | ||||
-rw-r--r-- | tests/valgrind/callgrind/modeltest.pro | 8 | ||||
-rw-r--r-- | tests/valgrind/memcheck/modeldemo.pro | 9 | ||||
-rw-r--r-- | tests/valgrind/memcheck/parsertests.pro | 19 | ||||
-rw-r--r-- | tests/valgrind/memcheck/testapps/uninit1/uninit1.pro | 2 | ||||
-rw-r--r-- | tests/valgrind/memcheck/testrunner.pro | 18 |
6 files changed, 23 insertions, 48 deletions
diff --git a/tests/valgrind/callgrind/callgrindparsertests.pro b/tests/valgrind/callgrind/callgrindparsertests.pro index e670db3f6f..6ecbcc633c 100644 --- a/tests/valgrind/callgrind/callgrindparsertests.pro +++ b/tests/valgrind/callgrind/callgrindparsertests.pro @@ -1,20 +1,11 @@ -include(../../../qtcreator.pri) -TEMPLATE = app +include(../../auto/qttest.pri) +include(../../../src/libs/valgrind/valgrind.pri) +include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) TARGET = callgrindparsertests -macx:CONFIG -= app_bundle - -QT += testlib network - DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" #enable extra debugging code DEFINES += "CALLGRINDPARSERTESTS" -!win32 { - include(../../../src/libs/valgrind/valgrind.pri) - include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) -} - SOURCES += callgrindparsertests.cpp - HEADERS += callgrindparsertests.h diff --git a/tests/valgrind/callgrind/modeltest.pro b/tests/valgrind/callgrind/modeltest.pro index 89a26fb0a8..0038639ec0 100644 --- a/tests/valgrind/callgrind/modeltest.pro +++ b/tests/valgrind/callgrind/modeltest.pro @@ -1,13 +1,13 @@ 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 TARGET = modeltest 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 diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/valgrind/memcheck/modeldemo.pro index 19cb65a328..1034124234 100644 --- a/tests/valgrind/memcheck/modeldemo.pro +++ b/tests/valgrind/memcheck/modeldemo.pro @@ -1,4 +1,8 @@ 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 TARGET = modeldemo @@ -8,11 +12,6 @@ QT += gui network 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 diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/valgrind/memcheck/parsertests.pro index c27b42664b..6338951f48 100644 --- a/tests/valgrind/memcheck/parsertests.pro +++ b/tests/valgrind/memcheck/parsertests.pro @@ -1,21 +1,14 @@ -include(../../../qtcreator.pri) -TEMPLATE = app -TARGET = parsertests +include(../../auto/qttest.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) -macx:CONFIG -= app_bundle +TARGET = parsertests -QT += testlib network +QT += 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/utils/utils.pri) -} - SOURCES += parsertests.cpp - HEADERS += parsertests.h diff --git a/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro index 68843829d5..26ab0e0689 100644 --- a/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro +++ b/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = uninit1 -QT += core +QT -= core gui macx:CONFIG -= app_bundle diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/valgrind/memcheck/testrunner.pro index 9881817884..f83c439412 100644 --- a/tests/valgrind/memcheck/testrunner.pro +++ b/tests/valgrind/memcheck/testrunner.pro @@ -1,20 +1,12 @@ -include(../../../qtcreator.pri) -TEMPLATE = app -TARGET = testrunner - -macx:CONFIG -= app_bundle +include(../../auto/qttest.pri) +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) -QT += testlib network +TARGET = testrunner DEFINES += "TESTRUNNER_SRC_DIR=\\\"$$_PRO_FILE_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 - HEADERS += testrunner.h |