From 663af1e7e0712e5e1d0ac3a334395ede1acd6dcf Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Thu, 7 Apr 2011 11:13:30 +0200
Subject: [PATCH] tests: cleanup of test projects. Also, add rpathing where
 needed.

---
 .../callgrind/callgrindparsertests.pro        | 15 +++------------
 tests/valgrind/callgrind/modeltest.pro        |  8 ++++----
 tests/valgrind/memcheck/modeldemo.pro         |  9 ++++-----
 tests/valgrind/memcheck/parsertests.pro       | 19 ++++++-------------
 .../memcheck/testapps/uninit1/uninit1.pro     |  2 +-
 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 e670db3f6fe..6ecbcc633c1 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 89a26fb0a88..0038639ec0d 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 19cb65a3282..1034124234f 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 c27b42664b0..6338951f487 100644
--- a/tests/valgrind/memcheck/parsertests.pro
+++ b/tests/valgrind/memcheck/parsertests.pro
@@ -1,21 +1,14 @@
-include(../../../qtcreator.pri)
-TEMPLATE = app
+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)
+
 TARGET = parsertests
 
-macx:CONFIG -= app_bundle
-
-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 68843829d56..26ab0e06890 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 9881817884a..f83c4394125 100644
--- a/tests/valgrind/memcheck/testrunner.pro
+++ b/tests/valgrind/memcheck/testrunner.pro
@@ -1,20 +1,12 @@
-include(../../../qtcreator.pri)
-TEMPLATE = app
+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)
+
 TARGET = testrunner
 
-macx:CONFIG -= app_bundle
-
-QT += testlib network
-
 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