From 561773ce2bbf69b040fdd7d245a89e469745444a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 24 Jan 2018 15:09:50 +0200 Subject: [PATCH] Valgrind: Show full command-line on valgrind execution Change-Id: I2cc5e966be44cb65f9dda5e55c38538badd78130 Reviewed-by: Tobias Hunger Reviewed-by: hjk --- src/plugins/valgrind/valgrindengine.cpp | 4 ++++ src/plugins/valgrind/valgrindrunner.cpp | 2 ++ src/plugins/valgrind/valgrindrunner.h | 1 + 3 files changed, 7 insertions(+) diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index cfe6648b012..7b6309247fc 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -88,6 +88,10 @@ void ValgrindToolRunner::start() connect(&m_runner, &ValgrindRunner::processOutputReceived, this, &ValgrindToolRunner::receiveProcessOutput); + connect(&m_runner, &ValgrindRunner::valgrindExecuted, + this, [this](const QString &commandLine) { + appendMessage(commandLine, NormalMessageFormat); + }); connect(&m_runner, &ValgrindRunner::processErrorReceived, this, &ValgrindToolRunner::receiveProcessError); connect(&m_runner, &ValgrindRunner::finished, diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index 2594f33e95b..692e02d4bec 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -114,6 +114,8 @@ void ValgrindRunner::Private::run() valgrind.device = m_device; valgrind.commandLineArguments = QtcProcess::joinArgs(fullArgs, m_device->osType()); Utils::QtcProcess::addArgs(&valgrind.commandLineArguments, m_debuggee.commandLineArguments); + emit q->valgrindExecuted(QtcProcess::quoteArg(valgrind.executable) + ' ' + + valgrind.commandLineArguments); if (m_device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) m_valgrindProcess.start(valgrind); diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index e567cd88399..2fc308fb7af 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -64,6 +64,7 @@ signals: void logMessageReceived(const QByteArray &); void processOutputReceived(const QString &, Utils::OutputFormat); void processErrorReceived(const QString &, QProcess::ProcessError); + void valgrindExecuted(const QString &); void valgrindStarted(qint64 pid); void finished(); void extraProcessFinished();