diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-01-18 14:22:16 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-01-31 09:26:00 +0200 |
| commit | 42221aa84cb4a7427edd8e7fedfe555ddf256b60 (patch) | |
| tree | 346e644b5a30eb465006a8a90b54ecf07a9986e6 /tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch | |
| parent | 9a83706046406f233ea6f93a2f90fd5b05916ee9 (diff) | |
Catch2: upgrade to 2.13.8
Update Catch2 header to latest released version. Needed
to build correctly with glibc 2.34.
Two patches applied on top of the upstream release. Previously
used Qt specific change extracted to a separate patch file.
Fixes: QTBUG-95842
Pick-to: 6.3 6.2
Change-Id: I67e442bbe756ff00c96a45eabf593f7aecddd628
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch')
| -rw-r--r-- | tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch b/tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch new file mode 100644 index 0000000000..6365cb774f --- /dev/null +++ b/tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch @@ -0,0 +1,24 @@ +From 426c2d7e32bc2f252e9d3323f633ac73222a7afc Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Thu, 20 Jan 2022 09:04:54 +0200 +Subject: [PATCH] Catch2: Fix console width for Qt tests + +Disabled by Qt so that test failures are not line-broken +--- + tests/auto/testlib/selftests/catch_p_p.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/auto/testlib/selftests/catch_p_p.h b/tests/auto/testlib/selftests/catch_p_p.h +index db1fed3b98..26bb41f4f0 100644 +--- a/tests/auto/testlib/selftests/catch_p_p.h ++++ b/tests/auto/testlib/selftests/catch_p_p.h +@@ -8413,7 +8413,9 @@ namespace Catch { + #define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH + #undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH + #endif ++#if 0 // Disabled by Qt so that test failures are not line-broken + #define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1 ++#endif + + #ifdef __clang__ + #pragma clang diagnostic push |