diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-15 14:25:21 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-10-15 18:09:38 +0200 |
commit | 8d777cdebd7163763c6f43e9b90bbd6956760dba (patch) | |
tree | 72fe0a09c8b76b50936123ebde4fa71b75ec6c71 | |
parent | f5d03e1f4cc150165277dd24dfd8777d2d4b0401 (diff) |
consolidate test binary locations
Do not use debug/release subdirectories on Windows to make it easy
for the testRunner tool to find tests.
Change-Id: I3bc572c7959c6bcc7cd7e12e1f5d4bb6ccb0753c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r-- | tests/auto/blackbox/blackbox.pro | 1 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 | ||||
-rw-r--r-- | tests/auto/language/language.pro | 1 | ||||
-rw-r--r-- | tests/auto/tools/tools.pro | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro index 63fdd45e8..f007910ab 100644 --- a/tests/auto/blackbox/blackbox.pro +++ b/tests/auto/blackbox/blackbox.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = tst_blackbox +DESTDIR = $$OUT_PWD DEPENDPATH += . INCLUDEPATH += . ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 224de65b1..113c8e7ff 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -34,12 +34,9 @@ static QString initQbsExecutableFilePath() { QString filePath = QCoreApplication::applicationDirPath() + QLatin1String("/../../../"); - if (qbs::HostOsInfo::isWindowsHost()) - filePath += QLatin1String("../"); filePath += "bin/qbs"; filePath = qbs::HostOsInfo::appendExecutableSuffix(QDir::cleanPath(filePath)); return filePath; - } TestBlackbox::TestBlackbox() diff --git a/tests/auto/language/language.pro b/tests/auto/language/language.pro index 1adb37b89..5965c6c0e 100644 --- a/tests/auto/language/language.pro +++ b/tests/auto/language/language.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = tst_language +DESTDIR = $$OUT_PWD DEPENDPATH += . INCLUDEPATH += . ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro index c5d5e9797..531360fdc 100644 --- a/tests/auto/tools/tools.pro +++ b/tests/auto/tools/tools.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = tst_tools +DESTDIR = $$OUT_PWD DEPENDPATH += . INCLUDEPATH += . ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" |