Commit 68a966cb authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Fix qbs project files for valgrind autotests.



They did not build on Windows.

Change-Id: I0c688b8e1b78e9bb06e2efd6e2cbf8791f272bc2
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 235abbb2
import qbs
import "../../autotest.qbs" as Autotest
import "../valgrindautotest.qbs" as ValgrindAutotest
Autotest {
ValgrindAutotest {
name: "Callgrind parser autotest"
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Valgrind" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"
files: ["callgrindparsertests.h", "callgrindparsertests.cpp"]
cpp.defines: base.concat([
'CALLGRINDPARSERTESTS',
'PARSERTESTS_DATA_DIR="' + path + '/data"'
......
import qbs
import "../../autotest.qbs" as Autotest
import "../valgrindautotest.qbs" as ValgrindAutotest
Autotest {
ValgrindAutotest {
name: "Memcheck ModelDemo autotest"
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Valgrind" }
Depends { name: "valgrind-fake" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
Depends { name: "Qt.network" }
files: ["modeldemo.h", "modeldemo.cpp"]
cpp.defines: base.concat([
......
import qbs
import "../../autotest.qbs" as Autotest
import "../valgrindautotest.qbs" as ValgrindAutotest
Autotest {
ValgrindAutotest {
name: "Memcheck parser autotest"
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Valgrind" }
Depends { name: "valgrind-fake" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
Depends { name: "Qt.network" }
files: ["parsertests.h", "parsertests.cpp"]
cpp.defines: base.concat([
......
import qbs
import "../../autotest.qbs" as Autotest
import "../valgrindautotest.qbs" as ValgrindAutotest
Autotest {
ValgrindAutotest {
name: "Memcheck test runner"
Depends { name: "Memcheck free1 autotest" }
Depends { name: "Memcheck free2 autotest" }
......@@ -15,10 +15,6 @@ Autotest {
Depends { name: "Memcheck uninit1 autotest" }
Depends { name: "Memcheck uninit2 autotest" }
Depends { name: "Memcheck uninit3 autotest" }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Valgrind" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
files: ["testrunner.h", "testrunner.cpp"]
destinationDirectory: project.ide_bin_path
cpp.defines: base.concat([
......
......@@ -2,7 +2,6 @@ import qbs
Project {
name: "Valgrind autotests"
condition: qbs.targetOS.contains("unix") // FIXME: doesn't link on Windows
references: [
"callgrind/callgrind.qbs",
"memcheck/memcheck.qbs"
......
import qbs
import "../autotest.qbs" as Autotest
Autotest {
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"
Group {
name: "XML protocol files from plugin"
prefix: product.pluginDir + "/xmlprotocol/"
files: ["*.h", "*.cpp"]
}
Group {
name: "Callgrind files from plugin"
prefix: product.pluginDir + "/callgrind/"
files: ["*.h", "*.cpp"]
}
Group {
name: "Memcheck runner files from plugin"
prefix: product.pluginDir + "/memcheck/"
files: ["*.h", "*.cpp"]
}
Group {
name: "Other files from plugin"
prefix: product.pluginDir + "/"
files: [
"valgrindprocess.h", "valgrindprocess.cpp",
"valgrindrunner.h", "valgrindrunner.cpp",
]
}
cpp.defines: base.concat([
'QT_DISABLE_DEPRECATED_BEFORE=0x040900',
])
cpp.includePaths: base.concat([project.ide_source_tree + "/src/plugins"])
}
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