From cea662550ea12aa9e3e4c8b632d9ca85c7f249ee Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 4 Jun 2021 17:05:12 +0200 Subject: [PATCH] Turn tst_QString::setRawData()'s QSKIP into QEXPECT_FAIL()s MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In commit 287ace562ee5ddff22f7dbf4e49ae5f0520f2308, part of this test was suppressed without filing a Jira ticket (or, at least, without recording it in the QSKIP message). Since it's a known failure, it should at least be a QEXPECT_FAIL, not a QSKIP. Since only some of the subsequent parts of the test fail, I used QEXPECT_FAIL(,,Continue) on each of the failing tests. Task-number: QTBUG-94450 Change-Id: Iebc6801210c289b4502e59116e71d5901b71aa46 Reviewed-by: Mårten Nordheim --- tests/auto/corelib/text/qstring/tst_qstring.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index dcc3c1ef82e..75d14fb8e1c 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -4106,13 +4106,14 @@ void tst_QString::setRawData() QVERIFY(cstr.constData() == ptr); QVERIFY(cstr == QString(ptr, 1)); - QSKIP("This is currently not working."); // This actually tests the recycling of the shared data object QString::DataPointer csd = cstr.data_ptr(); cstr.setRawData(ptr2, 1); + QEXPECT_FAIL("", "This is currently not working: QTBUG-94450.", Continue); QVERIFY(cstr.isDetached()); QVERIFY(cstr.constData() == ptr2); QVERIFY(cstr == QString(ptr2, 1)); + QEXPECT_FAIL("", "This is currently not working: QTBUG-94450.", Continue); QVERIFY(cstr.data_ptr() == csd); // This tests the discarding of the shared data object @@ -4123,6 +4124,7 @@ void tst_QString::setRawData() // Another test of the fallback csd = cstr.data_ptr(); cstr.setRawData(ptr2, 1); + QEXPECT_FAIL("", "This is currently not working: QTBUG-94450.", Continue); QVERIFY(cstr.isDetached()); QVERIFY(cstr.constData() == ptr2); QVERIFY(cstr == QString(ptr2, 1));