Commit 5fcdb73e authored by Nikolai Kosjar's avatar Nikolai Kosjar Committed by hjk
Browse files

Valgrind: Do not ignore/overwrite tool options



...otherwise all the options the user has set are in vain.

Change-Id: I6f344aafa848e3216a8ebf98e6fdddac26af4749
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent fc86c43f
...@@ -181,12 +181,12 @@ bool MemcheckRunner::start() ...@@ -181,12 +181,12 @@ bool MemcheckRunner::start()
const quint16 logPortNumber = d->logServer.serverPort(); const quint16 logPortNumber = d->logServer.serverPort();
connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected())); connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected()));
QStringList memcheckArguments; QStringList memcheckLogArguments;
memcheckArguments << QLatin1String("--xml=yes") memcheckLogArguments << QLatin1String("--xml=yes")
<< QString::fromLatin1("--xml-socket=%1:%2").arg(ip).arg(xmlPortNumber) << QString::fromLatin1("--xml-socket=%1:%2").arg(ip).arg(xmlPortNumber)
<< QLatin1String("--child-silent-after-fork=yes") << QLatin1String("--child-silent-after-fork=yes")
<< QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber); << QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber);
setValgrindArguments(memcheckArguments); setValgrindArguments(memcheckLogArguments + valgrindArguments());
return ValgrindRunner::start(); return ValgrindRunner::start();
} }
......
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