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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	src/shared/qbs

Change-Id: I33e13270c8c15a51b4ce4eaa6b4584041ed124e0
This commit is contained in:
Eike Ziller
2023-03-13 12:30:04 +01:00
parent f1d50c0d55 4d2b448541
commit c7e94d80c7
62 changed files with 446 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/autotest/gtest/gtestoutputreader.cpp
View File

@@ -68,13 +68,8 @@ void GTestOutputReader::processOutputLine(const QByteArray &outputLine)
m_iteration = match.captured(1).toInt();
m_description.clear();
} else if (line.startsWith(QStringLiteral("Note:"))) {
m_description = line;
if (m_iteration > 1)
m_description.append(' ' + Tr::tr("(iteration %1)").arg(m_iteration));
GTestResult testResult(id(), {}, m_projectFile);
testResult.setResult(ResultType::MessageInternal);
testResult.setDescription(m_description);
reportResult(testResult);
// notes contain insignificant information we fail to include properly into the
// visual tree, so ignore them here as they are available inside the text display anyhow
m_description.clear();
} else if (ExactMatch match = disabledTests.match(line)) {
m_disabled = match.captured(1).toInt();