From ea837bb8d82ea8259e61dc7188bfbbb7f2a560a3 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 5 Jul 2016 10:40:34 +0200 Subject: [PATCH] ClangStaticAnalyzer: Improve debug output * Normalize line endings from process output * Do not print extra quotes Change-Id: I39e055bed09c4fe52878d63fc443130d70be95cb Reviewed-by: Christian Kandeler --- .../clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | 3 ++- .../clangstaticanalyzer/clangstaticanalyzerrunner.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index c286a22c017..ad51016af68 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -564,7 +564,8 @@ void ClangStaticAnalyzerRunControl::onRunnerFinishedWithSuccess(const QString &l void ClangStaticAnalyzerRunControl::onRunnerFinishedWithFailure(const QString &errorMessage, const QString &errorDetails) { - qCDebug(LOG) << "onRunnerFinishedWithFailure:" << errorMessage << errorDetails; + qCDebug(LOG).noquote() << "onRunnerFinishedWithFailure:" + << errorMessage << '\n' << errorDetails; ++m_filesNotAnalyzed; m_success = false; diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp index 291e19ece96..04ee9f8155f 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp @@ -114,7 +114,7 @@ bool ClangStaticAnalyzerRunner::run(const QString &filePath, const QStringList & compilerOptions); m_commandLine = Utils::QtcProcess::joinArgs(QStringList(m_clangExecutable) + arguments); - qCDebug(LOG) << "Starting" << m_commandLine; + qCDebug(LOG).noquote() << "Starting" << m_commandLine; m_process.start(m_clangExecutable, arguments); return true; } @@ -177,7 +177,8 @@ QString ClangStaticAnalyzerRunner::processCommandlineAndOutput() const "Output:\n%3") .arg(m_commandLine, QString::number(m_process.error()), - QString::fromLocal8Bit(m_processOutput)); + Utils::SynchronousProcess::normalizeNewlines( + QString::fromLocal8Bit(m_processOutput))); } QString ClangStaticAnalyzerRunner::actualLogFile() const