AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testlib selftest: Only warn about missing test expectation if none was found

Browse Source 
Change-Id: I55e19d0a7b9b58ceeee4f25612f4a1d9ec66eb76
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-07-22 14:33:04 +02:00
parent 1a189c0701
commit e5761061f2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/testlib/selftests/tst_selftests.cpp
View File

@ -868,6 +868,7 @@ void checkTestOutput(const QString &test, const TestLogger &logger, const QByteA
return true;
};
bool foundExpectionFile = false;
for (int version = 0; !expectationMatched; ++version) {
// Look for a test expectation file. Most tests only have a single
// expectation file, while some have multiple versions that should
@ -888,12 +889,14 @@ void checkTestOutput(const QString &test, const TestLogger &logger, const QByteA
} else {
// No more versions found, and still no match
assert(!expectationMatched);
outputMessage += "Could not find any expectation files for subtest '" + test + "'";
if (!foundExpectionFile)
outputMessage += "Could not find any expectation files for subtest '" + test + "'";
break;
}
}
// Found expected result
foundExpectionFile = true;
QString errorMessage;
auto expectedLines = splitLines(expected);
if (compareOutput(logger.shortName(), test, actual, actualLines, expectedLines, &errorMessage)) {