From e1d339b72c3bae3a3250607cea91dd9a303ac28c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 19 Dec 2016 09:09:46 +0100 Subject: Valgrind: Fix Qbs build Change-Id: I67e0b3baa68589eec58d407e6886f51866cfa275 Reviewed-by: Christian Kandeler Reviewed-by: Christian Stenger --- src/plugins/valgrind/valgrind.qbs | 9 ++++++++- src/plugins/valgrind/valgrindmemcheckparsertest.cpp | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/plugins/valgrind') diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index 9bffc87ef9..f82ba7c223 100644 --- a/src/plugins/valgrind/valgrind.qbs +++ b/src/plugins/valgrind/valgrind.qbs @@ -1,4 +1,5 @@ -import qbs 1.0 +import qbs +import qbs.FileInfo QtcPlugin { name: "Valgrind" @@ -98,5 +99,11 @@ QtcPlugin { "valgrindtestrunnertest.cpp", "valgrindtestrunnertest.h", ] + cpp.defines: outer.concat([ + 'PARSERTESTS_DATA_DIR="' + FileInfo.joinPaths(path, "unit_testdata") + '"', + 'VALGRIND_FAKE_PATH="' + FileInfo.joinPaths(project.buildDirectory, qtc.ide_bin_path) + '"', + 'TESTRUNNER_SRC_DIR="' + FileInfo.joinPaths(path, "../../../tests/auto/valgrind/memcheck/testapps") + '"', + 'TESTRUNNER_APP_DIR="' + FileInfo.joinPaths(project.buildDirectory, qtc.ide_bin_path, "testapps") + '"' + ]) } } diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp index 58000ca2a4..4c9fa218f4 100644 --- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp +++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp @@ -89,6 +89,10 @@ static QString fakeValgrindExecutable() if (fi.exists()) return fi.canonicalFilePath(); fi = QFileInfo(QString(valgrindFakePath + "/release"), "valgrind-fake.exe"); + if (fi.exists()) + return fi.canonicalFilePath(); + // Qbs uses the install-root/bin + fi = QFileInfo(valgrindFakePath, "valgrind-fake.exe"); if (fi.exists()) return fi.canonicalFilePath(); qFatal("Neither debug nor release build valgrind-fake found."); -- cgit v1.2.1