1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix misspelled QTEST_THROW_ON_FAILURE

Browse Source 
Amends e769cf026e328ed7fff660c204ce6e55b80114e3.

Reported-by: Ahmad Samir <a.samirh78@gmail.com>
Task-number: QTBUG-66320
Change-Id: Ib731acf6b7e56c848aa79772488186efdd856c71
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 45e9f5f2e5f0701ad4dffbe532206b791d698953)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-06-17 08:18:19 +02:00 committed by Qt Cherry-pick Bot
parent 9d89e28f1c
commit 2b8cf058f1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestcase.h
View File

@ -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

2
tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
View File

@ -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 <QtCore/QCoreApplication>

2
tests/auto/testlib/selftests/subtest/tst_subtest.cpp
View File

@ -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 <QtCore/QCoreApplication>

2
tests/auto/testlib/selftests/warnings/tst_warnings.cpp
View File

@ -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 <QtCore/QCoreApplication>
#include <QtCore/QRegularExpression>