From cbeb77030fd41e55acd7ea9f310e6d601f5f5f84 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Jul 2014 13:34:55 +0200 Subject: [PATCH] Autotests: Fix qbs build. The semantic change in product.buildDirectory broke some autotests. Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58 Reviewed-by: Joerg Bornemann --- qbs/imports/QtcAutotest.qbs | 8 ++++---- tests/auto/debugger/dumpers.qbs | 2 +- tests/auto/extensionsystem/plugin.qbs | 7 ++++--- tests/auto/valgrind/memcheck/modeldemo.qbs | 2 +- tests/auto/valgrind/memcheck/parsertests.qbs | 2 +- tests/auto/valgrind/memcheck/testapps/testapp.qbs | 3 ++- tests/auto/valgrind/memcheck/testrunner.qbs | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index e05257e9851..376c2f91c64 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -8,13 +8,13 @@ QtcProduct { targetName: "tst_" + name.split(' ').join("") // This needs to be absolute, because it is passed to one of the source files. - destinationDirectory: buildDirectory + '/' + destinationDirectory: project.buildDirectory + '/' + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) cpp.rpaths: [ - buildDirectory + '/' + project.ide_library_path, - buildDirectory + '/' + project.ide_library_path + "/..", // OSX - buildDirectory + '/' + project.ide_plugin_path + project.buildDirectory + '/' + project.ide_library_path, + project.buildDirectory + '/' + project.ide_library_path + "/..", // OSX + project.buildDirectory + '/' + project.ide_plugin_path ] cpp.minimumOsxVersion: "10.7" cpp.defines: base.filter(function(d) { return d != "QT_NO_CAST_FROM_ASCII"; }) diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs index 2ca6226fbc4..e3f10b331c6 100644 --- a/tests/auto/debugger/dumpers.qbs +++ b/tests/auto/debugger/dumpers.qbs @@ -26,7 +26,7 @@ QtcAutotest { } cpp.defines: base.concat([ - 'CDBEXT_PATH="' + buildDirectory + '\\\\lib"', + 'CDBEXT_PATH="' + project.buildDirectory + '\\\\lib"', 'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"', 'QT_NO_CAST_FROM_ASCII', 'QT_DISABLE_DEPRECATED_BEFORE=0x040900' diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs index f7b99b7f7c6..98c27e15c70 100644 --- a/tests/auto/extensionsystem/plugin.qbs +++ b/tests/auto/extensionsystem/plugin.qbs @@ -9,10 +9,11 @@ DynamicLibrary { Depends { name: "cpp" } Depends { name: "Qt.core" } targetName: QtcFunctions.qtLibraryName(qbs, name.split('_')[1]) - destinationDirectory: FileInfo.relativePath(project.ide_source_tree, sourceDirectory) + destinationDirectory: project.buildDirectory + '/' + + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) cpp.rpaths: [ - buildDirectory + "/" + project.libDirName + "/qtcreator", - buildDirectory + "/" + project.libDirName + "/qtcreator/plugins" + project.buildDirectory + "/" + project.libDirName + "/qtcreator", + project.buildDirectory + "/" + project.libDirName + "/qtcreator/plugins" ].concat(additionalRPaths) property pathList filesToCopy property pathList additionalRPaths: [] diff --git a/tests/auto/valgrind/memcheck/modeldemo.qbs b/tests/auto/valgrind/memcheck/modeldemo.qbs index c6a4a4ee458..a2f9c538903 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.qbs +++ b/tests/auto/valgrind/memcheck/modeldemo.qbs @@ -8,6 +8,6 @@ ValgrindAutotest { files: ["modeldemo.h", "modeldemo.cpp"] cpp.defines: base.concat([ 'PARSERTESTS_DATA_DIR="' + path + '/data"', - 'VALGRIND_FAKE_PATH="' + product.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"' + 'VALGRIND_FAKE_PATH="' + project.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"' ]) } diff --git a/tests/auto/valgrind/memcheck/parsertests.qbs b/tests/auto/valgrind/memcheck/parsertests.qbs index 3e0dabcdf4e..60ced3f8d46 100644 --- a/tests/auto/valgrind/memcheck/parsertests.qbs +++ b/tests/auto/valgrind/memcheck/parsertests.qbs @@ -8,6 +8,6 @@ ValgrindAutotest { files: ["parsertests.h", "parsertests.cpp"] cpp.defines: base.concat([ 'PARSERTESTS_DATA_DIR="' + path + '/data"', - 'VALGRIND_FAKE_PATH="' + product.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"' + 'VALGRIND_FAKE_PATH="' + project.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"' ]) } diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs index f4ded887483..fa88860dff3 100644 --- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs +++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs @@ -5,6 +5,7 @@ QtcAutotest { name: "Memcheck " + testName + " autotest" property string testName targetName: testName // Test runner hardcodes the names of the executables - destinationDirectory: buildDirectory + '/' + project.ide_bin_path + '/testapps/' + testName + destinationDirectory: project.buildDirectory + '/' + + project.ide_bin_path + '/testapps/' + testName files: "main.cpp" } diff --git a/tests/auto/valgrind/memcheck/testrunner.qbs b/tests/auto/valgrind/memcheck/testrunner.qbs index 686554b974d..a274933bdf2 100644 --- a/tests/auto/valgrind/memcheck/testrunner.qbs +++ b/tests/auto/valgrind/memcheck/testrunner.qbs @@ -19,6 +19,6 @@ ValgrindAutotest { destinationDirectory: project.ide_bin_path cpp.defines: base.concat([ 'TESTRUNNER_SRC_DIR="' + path + '/testapps"', - 'TESTRUNNER_APP_DIR="' + product.buildDirectory + '/' + destinationDirectory + '/testapps"' + 'TESTRUNNER_APP_DIR="' + project.buildDirectory + '/' + destinationDirectory + '/testapps"' ]) }