diff options
Diffstat (limited to 'tests/auto/testlib/selftests/patches')
-rw-r--r-- | tests/auto/testlib/selftests/patches/0001-Catch2-Fix-console-width-for-Qt-tests.patch | 24 | ||||
-rw-r--r-- | tests/auto/testlib/selftests/patches/0001-Fix-Catch2-compiling-for-INTEGRITY.patch | 31 |
2 files changed, 55 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 diff --git a/tests/auto/testlib/selftests/patches/0001-Fix-Catch2-compiling-for-INTEGRITY.patch b/tests/auto/testlib/selftests/patches/0001-Fix-Catch2-compiling-for-INTEGRITY.patch new file mode 100644 index 0000000000..775f77d6af --- /dev/null +++ b/tests/auto/testlib/selftests/patches/0001-Fix-Catch2-compiling-for-INTEGRITY.patch @@ -0,0 +1,31 @@ +From 8cc32e6302edc38c0e525edc654cf57bf1f68bea Mon Sep 17 00:00:00 2001 +From: Tatiana Borisova <tatiana.borisova@qt.io> +Date: Mon, 13 Sep 2021 15:45:26 +0300 +Subject: [PATCH] Fix Catch2 compiling for INTEGRITY + +- Exclude Green Hills compiler from Catch2's POSIX signal handling. + GHS, at least on INTEGRITY, doesn't support full POSIX signals. + +Task-number: QTBUG-96176 +Pick-to: 6.2 6.2.0 +Change-Id: Ifec06dca43ed766cb7335e40fc357d0d7bc463a6 +--- + tests/auto/testlib/selftests/catch_p_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/auto/testlib/selftests/catch_p_p.h b/tests/auto/testlib/selftests/catch_p_p.h +index 596bfe63dd..47a31f9079 100644 +--- a/tests/auto/testlib/selftests/catch_p_p.h ++++ b/tests/auto/testlib/selftests/catch_p_p.h +@@ -179,7 +179,7 @@ namespace Catch { + + //////////////////////////////////////////////////////////////////////////////// + // We know some environments not to support full POSIX signals +-#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) ++#if defined(__CYGWIN__) || defined(__QNX__) || defined(__ghs) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) + #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS + #endif + +-- +2.25.1 + |