Commit cbeb7703 authored by Christian Kandeler's avatar Christian Kandeler

Autotests: Fix qbs build.

The semantic change in product.buildDirectory broke some autotests.

Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent c5d34eb6
......@@ -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"; })
......
......@@ -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'
......
......@@ -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: []
......
......@@ -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"'
])
}
......@@ -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"'
])
}
......@@ -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"
}
......@@ -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"'
])
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment