feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotests: Fix qbs build.

Browse Source 
The semantic change in product.buildDirectory broke some autotests.

Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-07-16 13:34:55 +02:00
parent c5d34eb6b3
commit cbeb77030f
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qbs/imports/QtcAutotest.qbs
View File

@@ -8,13 +8,13 @@ QtcProduct {
targetName: "tst_" + name.split(' ').join("") targetName: "tst_" + name.split(' ').join("")
// This needs to be absolute, because it is passed to one of the source files. // 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) + FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
cpp.rpaths: [ cpp.rpaths: [
buildDirectory + '/' + project.ide_library_path, project.buildDirectory + '/' + project.ide_library_path,
buildDirectory + '/' + project.ide_library_path + "/..", // OSX project.buildDirectory + '/' + project.ide_library_path + "/..", // OSX
buildDirectory + '/' + project.ide_plugin_path project.buildDirectory + '/' + project.ide_plugin_path
] ]
cpp.minimumOsxVersion: "10.7" cpp.minimumOsxVersion: "10.7"
cpp.defines: base.filter(function(d) { return d != "QT_NO_CAST_FROM_ASCII"; }) cpp.defines: base.filter(function(d) { return d != "QT_NO_CAST_FROM_ASCII"; })

2
tests/auto/debugger/dumpers.qbs
View File

@@ -26,7 +26,7 @@ QtcAutotest {
} }
cpp.defines: base.concat([ cpp.defines: base.concat([
'CDBEXT_PATH="' + buildDirectory + '\\\\lib"', 'CDBEXT_PATH="' + project.buildDirectory + '\\\\lib"',
'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"', 'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"',
'QT_NO_CAST_FROM_ASCII', 'QT_NO_CAST_FROM_ASCII',
'QT_DISABLE_DEPRECATED_BEFORE=0x040900' 'QT_DISABLE_DEPRECATED_BEFORE=0x040900'

7
tests/auto/extensionsystem/plugin.qbs
View File

@@ -9,10 +9,11 @@ DynamicLibrary {
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
targetName: QtcFunctions.qtLibraryName(qbs, name.split('_')[1]) 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: [ cpp.rpaths: [
buildDirectory + "/" + project.libDirName + "/qtcreator", project.buildDirectory + "/" + project.libDirName + "/qtcreator",
buildDirectory + "/" + project.libDirName + "/qtcreator/plugins" project.buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
].concat(additionalRPaths) ].concat(additionalRPaths)
property pathList filesToCopy property pathList filesToCopy
property pathList additionalRPaths: [] property pathList additionalRPaths: []

2
tests/auto/valgrind/memcheck/modeldemo.qbs
View File

@@ -8,6 +8,6 @@ ValgrindAutotest {
files: ["modeldemo.h", "modeldemo.cpp"] files: ["modeldemo.h", "modeldemo.cpp"]
cpp.defines: base.concat([ cpp.defines: base.concat([
'PARSERTESTS_DATA_DIR="' + path + '/data"', '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"'
]) ])
} }

2
tests/auto/valgrind/memcheck/parsertests.qbs
View File

@@ -8,6 +8,6 @@ ValgrindAutotest {
files: ["parsertests.h", "parsertests.cpp"] files: ["parsertests.h", "parsertests.cpp"]
cpp.defines: base.concat([ cpp.defines: base.concat([
'PARSERTESTS_DATA_DIR="' + path + '/data"', '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"'
]) ])
} }

3
tests/auto/valgrind/memcheck/testapps/testapp.qbs
View File

@@ -5,6 +5,7 @@ QtcAutotest {
name: "Memcheck " + testName + " autotest" name: "Memcheck " + testName + " autotest"
property string testName property string testName
targetName: testName // Test runner hardcodes the names of the executables 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" files: "main.cpp"
} }

2
tests/auto/valgrind/memcheck/testrunner.qbs
View File

@@ -19,6 +19,6 @@ ValgrindAutotest {
destinationDirectory: project.ide_bin_path destinationDirectory: project.ide_bin_path
cpp.defines: base.concat([ cpp.defines: base.concat([
'TESTRUNNER_SRC_DIR="' + path + '/testapps"', 'TESTRUNNER_SRC_DIR="' + path + '/testapps"',
'TESTRUNNER_APP_DIR="' + product.buildDirectory + '/' + destinationDirectory + '/testapps"' 'TESTRUNNER_APP_DIR="' + project.buildDirectory + '/' + destinationDirectory + '/testapps"'
]) ])
} }