diff options
| author | Marc Mutz <[email protected]> | 2024-07-22 22:50:08 +0200 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2024-08-03 12:30:06 +0200 |
| commit | 69c510d6bcc52ac133a82d7a9493ffba037c4521 (patch) | |
| tree | 1aee336b5066e0658c34516c8e72ee5de06b154c | |
| parent | b5115d1c2fc73feb149a8ee97de011b3c75694fb (diff) | |
QtTest: mark more functions as cold
Unit test failure should not happen, so mark failure formatters as
cold (like qFail() itself).
As a drive-by, mark formatFailMessage() overloads file-static, too.
Pick-to: 6.8
Change-Id: I92f5b674a7282f4ebaa9250894a9971a524f4108
Reviewed-by: Volker Hilsheimer <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>
| -rw-r--r-- | src/testlib/qtestcase.h | 3 | ||||
| -rw-r--r-- | src/testlib/qtestresult.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 2c2c3263ff6..b118a2066b9 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -315,8 +315,9 @@ namespace QTest Q_TESTLIB_EXPORT void maybeThrowOnFail(); Q_TESTLIB_EXPORT void maybeThrowOnSkip(); + Q_DECL_COLD_FUNCTION Q_TESTLIB_EXPORT QString formatTryTimeoutDebugMessage(q_no_char8_t::QUtf8StringView expr, int timeout, int actual); - Q_TESTLIB_EXPORT + Q_TESTLIB_EXPORT Q_DECL_COLD_FUNCTION const char *formatPropertyTestHelperFailure(char *msg, size_t maxMsgLen, const char *actual, const char *expected, const char *actualExpr, diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 24ab6f43b95..fd4a9fd2f75 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -342,6 +342,7 @@ static int approx_wide_len(const char *s) } // Overload to format failures for "const char *" - no need to strdup(). +static Q_DECL_COLD_FUNCTION void formatFailMessage(char *msg, size_t maxMsgLen, const char *failureMsg, const char *val1, const char *val2, @@ -382,6 +383,7 @@ QTest::Internal::formatPropertyTestHelperFailure(char *msg, size_t maxMsgLen, // Format failures using the toString() template template <class Actual, class Expected> +static Q_DECL_COLD_FUNCTION void formatFailMessage(char *msg, size_t maxMsgLen, const char *failureMsg, const Actual &val1, const Expected &val2, |