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

Valgrind: Move to Utils::FilePath in some places

Browse Source 
Change-Id: I54d03ccda62121055509fd24c5c98a13f7605964
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-07-23 08:30:25 +02:00
parent 5efa84b91f
commit b0e52f7ff6
6 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/valgrind/valgrindmemcheckparsertest.cpp
View File

@@ -477,9 +477,9 @@ void ValgrindMemcheckParserTest::testValgrindGarbage()
void ValgrindMemcheckParserTest::testParserStop()
{
ValgrindRunner runner;
runner.setValgrindExecutable(fakeValgrindExecutable());
runner.setValgrindArguments({QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()),
"-i", dataFile("memcheck-output-sample1.xml"), "--wait", "5" });
runner.setValgrindCommand({FilePath::fromString(fakeValgrindExecutable()),
{QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()),
"-i", dataFile("memcheck-output-sample1.xml"), "--wait", "5" }});
runner.setProcessChannelMode(QProcess::ForwardedChannels);
runner.setDevice(ProjectExplorer::DeviceManager::instance()->defaultDevice(
@@ -502,7 +502,7 @@ void ValgrindMemcheckParserTest::testRealValgrind()
debuggee.executable = FilePath::fromString(executable);
debuggee.environment = sysEnv;
ValgrindRunner runner;
runner.setValgrindExecutable("valgrind");
runner.setValgrindCommand({FilePath::fromString("valgrind"), {}});
runner.setDebuggee(debuggee);
runner.setDevice(ProjectExplorer::DeviceManager::instance()->defaultDevice(
ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE));
@@ -541,8 +541,7 @@ void ValgrindMemcheckParserTest::testValgrindStartError()
debuggeeExecutable.commandLineArguments = debuggeeArgs;
ValgrindRunner runner;
runner.setValgrindExecutable(valgrindExe);
runner.setValgrindArguments(valgrindArgs);
runner.setValgrindCommand({FilePath::fromString(valgrindExe), valgrindArgs});
runner.setDebuggee(debuggeeExecutable);
runner.setDevice(ProjectExplorer::DeviceManager::instance()->defaultDevice(
ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE));