From eb4fb9fa32797d48d4779464483230ad92f349a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 6 Aug 2021 13:22:06 +0200 Subject: [PATCH] testlib: Don't report blacklisted tests as failures in JUnit reporter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't produce elements for them, so we shouldn't include them in the total count of failures. In the future we might produce elements instead, but for now remove the incorrect increment. Pick-to: 6.2 Change-Id: Ia89a5cdaf79f6aa2f92be53180112c40ad6da2c6 Reviewed-by: Edward Welbourne Reviewed-by: Mårten Nordheim --- src/testlib/qjunittestlogger.cpp | 2 -- tests/auto/testlib/selftests/expected_blacklisted.junitxml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp index 4d8ed2ae592..1e375bb33ff 100644 --- a/src/testlib/qjunittestlogger.cpp +++ b/src/testlib/qjunittestlogger.cpp @@ -240,14 +240,12 @@ void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description, typeBuf = "bpass"; break; case QAbstractTestLogger::BlacklistedFail: - ++failureCounter; typeBuf = "bfail"; break; case QAbstractTestLogger::BlacklistedXPass: typeBuf = "bxpass"; break; case QAbstractTestLogger::BlacklistedXFail: - ++failureCounter; typeBuf = "bxfail"; break; default: diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml index 0051659da91..3a90685794d 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml +++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml @@ -1,5 +1,5 @@ - +