summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2018-03-27 16:53:32 +0200
committerLiang Qi <liang.qi@qt.io>2018-03-27 19:34:04 +0000
commitf69d32b535d456a2441754ef5733c7fb65411d6c (patch)
tree14291fa5c44b62d5d78ad0e995092896fd020fdc /tests/auto
parent3e91625b58b4d7d2757678de9d77eef91e84df36 (diff)
testlib: Ignore line locations from TAP reporter when running selftests
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>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/testlib/selftests/tst_selftests.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 1da1787c1d..423f33c90e 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -868,7 +868,9 @@ bool tst_Selftests::compareOutput(const QString &logger, const QString &subdir,
}
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;
}