[ros-diffs] [reactos] 02/29: [COMPILER_APITEST] Disable SEH tests for GCC amd64 build

[Jérôme Gardou]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79bc62f206ef78ef232ab…

commit 79bc62f206ef78ef232ab6758f4e4bda30ca9473
Author:     Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Fri Apr 9 16:52:53 2021 +0200
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed Apr 28 13:10:23 2021 +0200

    [COMPILER_APITEST] Disable SEH tests for GCC amd64 build
---
 modules/rostests/apitests/compiler/CMakeLists.txt | 12 +++++++++---
 modules/rostests/apitests/compiler/testlist.c     |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/rostests/apitests/compiler/CMakeLists.txt
b/modules/rostests/apitests/compiler/CMakeLists.txt
index 7bd2a6a6b22..1d98f54ddf6 100644
--- a/modules/rostests/apitests/compiler/CMakeLists.txt
+++ b/modules/rostests/apitests/compiler/CMakeLists.txt
@@ -1,15 +1,21 @@
 
-add_subdirectory(ms)
+if (NOT (GCC AND (ARCH STREQUAL "amd64")))
+    #FIXME _setjmp definitions in CRT headers is wrong
+    add_subdirectory(ms)
+    list(APPEND SOURCE ms_seh.c)
+endif()
 
 list(APPEND SOURCE
-    ms_seh.c
     pseh.c
     pseh_cpp.cpp
     psehtest2.c
     testlist.c)
 
 add_executable(compiler_apitest ${SOURCE})
-target_link_libraries(compiler_apitest ms_seh_test wine ${PSEH_LIB})
+if (NOT (GCC AND (ARCH STREQUAL "amd64")))
+    target_link_libraries(compiler_apitest ms_seh_test)
+endif()
+target_link_libraries(compiler_apitest wine ${PSEH_LIB})
 set_module_type(compiler_apitest win32cui)
 add_importlibs(compiler_apitest msvcrt kernel32 ntdll)
 add_rostests_file(TARGET compiler_apitest)
diff --git a/modules/rostests/apitests/compiler/testlist.c
b/modules/rostests/apitests/compiler/testlist.c
index f034cb93127..d73f7fd70bb 100644
--- a/modules/rostests/apitests/compiler/testlist.c
+++ b/modules/rostests/apitests/compiler/testlist.c
@@ -7,7 +7,9 @@ extern void func_pseh_cpp(void);
 
 const struct test winetest_testlist[] =
 {
+#if !(defined(__GNUC__) && defined(_M_AMD64))
     { "ms-seh", func_ms_seh },
+#endif
     { "pseh", func_pseh },
     { "pseh_cpp", func_pseh_cpp },
     { 0, 0 }