From 2b8cf058f198506ba2d4083cd7f229520b9957d6 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 17 Jun 2024 08:18:19 +0200 Subject: [PATCH] Fix misspelled QTEST_THROW_ON_FAILURE Amends e769cf026e328ed7fff660c204ce6e55b80114e3. Reported-by: Ahmad Samir Task-number: QTBUG-66320 Change-Id: Ib731acf6b7e56c848aa79772488186efdd856c71 Reviewed-by: Ahmad Samir (cherry picked from commit 45e9f5f2e5f0701ad4dffbe532206b791d698953) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qtestcase.h | 6 +++--- .../auto/testlib/selftests/blacklisted/tst_blacklisted.cpp | 2 +- tests/auto/testlib/selftests/subtest/tst_subtest.cpp | 2 +- tests/auto/testlib/selftests/warnings/tst_warnings.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index a855ace6a9a..44371c00a19 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_EXCEPTIONS -#ifdef QTEST_THROW_ON_FAILURE +#ifdef QTEST_THROW_ON_FAIL # define QTEST_FAIL_ACTION QTest::Internal::throwOnFail() #else # define QTEST_FAIL_ACTION do { QTest::Internal::maybeThrowOnFail(); return; } while (false) @@ -39,8 +39,8 @@ QT_BEGIN_NAMESPACE #endif #else -# if defined(QTEST_THROW_ON_FAILURE) || defined(QTEST_THROW_ON_SKIP) -# error QTEST_THROW_ON_FAILURE/SKIP require exception support enabled. +# if defined(QTEST_THROW_ON_FAIL) || defined(QTEST_THROW_ON_SKIP) +# error QTEST_THROW_ON_FAIL/SKIP require exception support enabled. # endif #endif // QT_NO_EXCEPTIONS diff --git a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp index d59b6244c18..fb7ffcebc3e 100644 --- a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp +++ b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#undef QTEST_THROW_ON_FAILURE // fails ### investigate +#undef QTEST_THROW_ON_FAIL // fails ### investigate #undef QTEST_THROW_ON_SKIP // fails ### investigate #include diff --git a/tests/auto/testlib/selftests/subtest/tst_subtest.cpp b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp index 023c43e2afa..3a483f515a2 100644 --- a/tests/auto/testlib/selftests/subtest/tst_subtest.cpp +++ b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#undef QTEST_THROW_ON_FAILURE // code expects old behavior +#undef QTEST_THROW_ON_FAIL // code expects old behavior #undef QTEST_THROW_ON_SKIP // code expects old behavior #include diff --git a/tests/auto/testlib/selftests/warnings/tst_warnings.cpp b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp index 5add39ac888..40636f250a6 100644 --- a/tests/auto/testlib/selftests/warnings/tst_warnings.cpp +++ b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#undef QTEST_THROW_ON_FAILURE // fails ### investigate +#undef QTEST_THROW_ON_FAIL // fails ### investigate #include #include