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

testlib: Ignore line locations from TAP reporter when running selftests

Browse Source 
This is what the other reporters also do, in various forms.

Task-number: QTBUG-67351
Change-Id: I16f2c4e0991176145ee0fbcbbfeeda071603a3c2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-03-27 16:53:32 +02:00 committed by Liang Qi
parent 3e91625b58
commit f69d32b535
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -868,7 +868,9 @@ bool tst_Selftests::compareOutput(const QString &logger, const QString &subdir,
} }
if (logger.endsWith(QLatin1String("tap"))) { if (logger.endsWith(QLatin1String("tap"))) {
if (expectedLine.contains(QLatin1String("at:")) || expectedLine.contains(QLatin1String("file:"))) if (expectedLine.contains(QLatin1String("at:"))
|| expectedLine.contains(QLatin1String("file:"))
|| expectedLine.contains(QLatin1String("line:")))
actualLine = expectedLine; actualLine = expectedLine;
} }