diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-09-13 15:45:26 +0300 |
|---|---|---|
| committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-09-14 21:18:07 +0300 |
| commit | 4f2a515f12e18e932de563ee2a5d7a10ae09487e (patch) | |
| tree | adda981a81aee78747c3f14ab8095ca20f4e5038 /tests | |
| parent | 884e5c2c75a8e4d09da4f2c32b90a09436a7bda1 (diff) | |
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
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/testlib/selftests/catch_p_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/patches/0001-Fix-Catch2-compiling-for-INTEGRITY.patch | 31 |
2 files changed, 32 insertions, 1 deletions
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 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 + |