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

Valgrind: Use more Utils::CommandLine

Browse Source 
Change-Id: I044869c1b3cc061b2ad61de82832fb42cdcf4fd8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-06-12 14:25:34 +02:00
parent b508eac2a5
commit e3aa5a0658
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/valgrind/valgrindrunner.cpp
View File

@@ -82,17 +82,17 @@ public:
bool ValgrindRunner::Private::run() bool ValgrindRunner::Private::run()
{ {
QStringList arguments; CommandLine cmd{FilePath::fromString(m_valgrindExecutable)};
if (!localServerAddress.isNull()) { if (!localServerAddress.isNull()) {
if (!q->startServers()) if (!q->startServers())
return false; return false;
arguments.append("--child-silent-after-fork=yes"); cmd.addArg("--child-silent-after-fork=yes");
bool enableXml = !disableXml; bool enableXml = !disableXml;
auto handleSocketParameter = [&enableXml, &arguments](const QString &prefix, const QTcpServer &tcpServer) auto handleSocketParameter = [&enableXml, &cmd](const QString &prefix, const QTcpServer &tcpServer)
{ {
QHostAddress serverAddress = tcpServer.serverAddress(); QHostAddress serverAddress = tcpServer.serverAddress();
if (serverAddress.protocol() != QAbstractSocket::IPv4Protocol) { if (serverAddress.protocol() != QAbstractSocket::IPv4Protocol) {
@@ -101,8 +101,8 @@ bool ValgrindRunner::Private::run()
qWarning("Need IPv4 for valgrind"); qWarning("Need IPv4 for valgrind");
enableXml = false; enableXml = false;
} else { } else {
arguments << QString("%1=%2:%3").arg(prefix).arg(serverAddress.toString()) cmd.addArg(QString("%1=%2:%3").arg(prefix).arg(serverAddress.toString())
.arg(tcpServer.serverPort()); .arg(tcpServer.serverPort()));
} }
}; };
@@ -110,9 +110,9 @@ bool ValgrindRunner::Private::run()
handleSocketParameter("--log-socket", logServer); handleSocketParameter("--log-socket", logServer);
if (enableXml) if (enableXml)
arguments << "--xml=yes"; cmd.addArg("--xml=yes");
} }
arguments += m_valgrindArguments; cmd.addArgs(m_valgrindArguments);
m_valgrindProcess.setProcessChannelMode(channelMode); m_valgrindProcess.setProcessChannelMode(channelMode);
// consider appending our options last so they override any interfering user-supplied options // consider appending our options last so they override any interfering user-supplied options
@@ -138,18 +138,17 @@ bool ValgrindRunner::Private::run()
if (HostOsInfo::isMacHost()) if (HostOsInfo::isMacHost())
// May be slower to start but without it we get no filenames for symbols. // May be slower to start but without it we get no filenames for symbols.
arguments << "--dsymutil=yes"; cmd.addArg("--dsymutil=yes");
arguments << m_debuggee.executable; cmd.addArg(m_debuggee.executable);
cmd.addArgs(m_debuggee.commandLineArguments, CommandLine::Raw);
emit q->valgrindExecuted(cmd.toUserOutput());
Runnable valgrind; Runnable valgrind;
valgrind.executable = m_valgrindExecutable; valgrind.setCommandLine(cmd);
valgrind.workingDirectory = m_debuggee.workingDirectory; valgrind.workingDirectory = m_debuggee.workingDirectory;
valgrind.environment = m_debuggee.environment; valgrind.environment = m_debuggee.environment;
valgrind.device = m_device; valgrind.device = m_device;
valgrind.commandLineArguments = QtcProcess::joinArgs(arguments, 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) if (m_device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
m_valgrindProcess.start(valgrind); m_valgrindProcess.start(valgrind);