diff options
| author | Edward Welbourne <[email protected]> | 2021-08-16 16:58:32 +0200 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2021-09-13 17:19:18 +0200 |
| commit | ee23accac77a7519928d35a3d0da5d5de13b9bc8 (patch) | |
| tree | 9ec61a303c34dca0a9f52a877af27c0787d3da94 /src/testlib/qtestlog.cpp | |
| parent | c5a79d6dbc563719cfc71a2169cfa01156e10307 (diff) | |
Make clear why QTestLog::addB?XFail() don't add to counters
This reverts commit 904617dfb83f39a6a379635b64fea6fcd00f241a and makes
clear to future readers why that wouldn't be a sensible change.
Update the test's data, eliminating a case of duplicate counting that
was caused by the reverted commit.
Task-number: QTBUG-95661
Change-Id: Ice6d3ab06ca171e0d6eb0fac757f1ab774e229f0
Reviewed-by: Mårten Nordheim <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>
(cherry picked from commit 7af79ba09148dbfe5c1fc8b130d564dcca7ae4b3)
Diffstat (limited to 'src/testlib/qtestlog.cpp')
| -rw-r--r-- | src/testlib/qtestlog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 7fbb3155faa..0f3a9dfc694 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -338,6 +338,8 @@ void QTestLog::addXFail(const char *msg, const char *file, int line) QTEST_ASSERT(msg); QTEST_ASSERT(file); + // Will be counted in addPass() if we get there. + FOREACH_TEST_LOGGER logger->addIncident(QAbstractTestLogger::XFail, msg, file, line); } @@ -390,7 +392,7 @@ void QTestLog::addBXFail(const char *msg, const char *file, int line) QTEST_ASSERT(msg); QTEST_ASSERT(file); - ++QTest::blacklists; + // Will be counted in addBPass() if we get there. FOREACH_TEST_LOGGER logger->addIncident(QAbstractTestLogger::BlacklistedXFail, msg, file, line); |