diff --git a/tests/auto/corelib/text/CMakeLists.txt b/tests/auto/corelib/text/CMakeLists.txt index 099f0e7eef4..4d24e674ba3 100644 --- a/tests/auto/corelib/text/CMakeLists.txt +++ b/tests/auto/corelib/text/CMakeLists.txt @@ -1,7 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause +if (NOT WASM) # QTBUG-121822 add_subdirectory(qanystringview) +endif() add_subdirectory(qbytearray) add_subdirectory(qbytearray_large) add_subdirectory(qbytearrayapisymmetry) diff --git a/tests/auto/corelib/text/qanystringview/CMakeLists.txt b/tests/auto/corelib/text/qanystringview/CMakeLists.txt index 96837dadf60..894115d1c28 100644 --- a/tests/auto/corelib/text/qanystringview/CMakeLists.txt +++ b/tests/auto/corelib/text/qanystringview/CMakeLists.txt @@ -14,6 +14,10 @@ endif() qt_internal_add_test(tst_qanystringview SOURCES tst_qanystringview.cpp + NO_BATCH # QTBUG-121815 + DEFINES + QTEST_THROW_ON_FAIL + QTEST_THROW_ON_SKIP LIBRARIES Qt::CorePrivate Qt::TestPrivate diff --git a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp index 398be965306..51ea3025abb 100644 --- a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp +++ b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp @@ -28,6 +28,10 @@ #include #include +#ifndef QTEST_THROW_ON_FAIL +# error This test requires QTEST_THROW_ON_FAIL being active. +#endif + #ifdef __cpp_char8_t # define ONLY_IF_CHAR_8_T(expr) expr #else @@ -363,8 +367,6 @@ private Q_SLOTS: void fromUShort() const { fromCharacter(ushort(0xE4), 1); } void fromChar32T() const { fromCharacter(U'รค', 1); - if (QTest::currentTestFailed()) - return; fromCharacter(U'\x1F0A0', 2); // U+1F0A0: PLAYING CARD BACK } void fromWCharT() const { @@ -374,8 +376,6 @@ private Q_SLOTS: void fromQLatin1Char() const { fromCharacter(QLatin1Char('\xE4'), 1); } void fromQCharSpecialCharacter() const { fromCharacter(QChar::ReplacementCharacter, 1); - if (QTest::currentTestFailed()) - return; fromCharacter(QChar::LastValidCodePoint, 1); } @@ -661,20 +661,10 @@ void tst_QAnyStringView::fromQStringOrByteArray() const QVERIFY(!QAnyStringView(empty).isNull()); conversion_tests(QStringOrByteArray(Strings::oneChar)); - if (QTest::currentTestFailed()) - return; conversion_tests(QStringOrByteArray(Strings::twoChars)); - if (QTest::currentTestFailed()) - return; conversion_tests(QStringOrByteArray(Strings::threeChars)); - if (QTest::currentTestFailed()) - return; conversion_tests(QStringOrByteArray(Strings::regularString)); - if (QTest::currentTestFailed()) - return; conversion_tests(QStringOrByteArray(Strings::regularLongString)); - if (QTest::currentTestFailed()) - return; conversion_tests(QStringOrByteArray(Strings::stringWithNulls, Strings::stringWithNullsLength)); } @@ -760,18 +750,10 @@ void tst_QAnyStringView::fromRange() const doTest(reinterpret_cast(std::begin(Strings::regularString)), reinterpret_cast(std::end(Strings::regularString))); - if (QTest::currentTestFailed()) - return; - doTest(reinterpret_cast(std::begin(Strings::regularLongString)), reinterpret_cast(std::end(Strings::regularLongString))); - if (QTest::currentTestFailed()) - return; - doTest(reinterpret_cast(std::begin(Strings::stringWithNulls)), reinterpret_cast(std::end(Strings::stringWithNulls))); - if (QTest::currentTestFailed()) - return; } template @@ -786,8 +768,6 @@ void tst_QAnyStringView::fromContainer() const std::copy(s.begin(), s.end(), std::back_inserter(c)); conversion_tests(std::move(c)); - if (QTest::currentTestFailed()) - return; // repeat with nulls c = {};