From ccff9e4106ebd6387bf883912bd84fedc214d002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 28 Sep 2020 15:11:10 +0300 Subject: [PATCH] test: Update the conditions for skipping global-terminate.cpp on aarch64 Our pinned version of mingw-w64 is new enough already, and latest wine has implemented __C_specific_handler for aarch64, so this makes the test be bypassed with current pinned clang (10.0.0) and the soon to be released clang 11.0.0, but is executed with clang 12.0.0 (where current versions has got this implemented properly). --- test/global-terminate.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/global-terminate.cpp b/test/global-terminate.cpp index 54e9002..b407fb4 100644 --- a/test/global-terminate.cpp +++ b/test/global-terminate.cpp @@ -26,12 +26,9 @@ void whoa() { } int main(int argc, char *argv[]) { -#ifdef __aarch64__ - // This test succeeds with latest mingw-w64 (since 9718ecee1b95, Sept - // 2020) and latest clang (since 20f7773bb4bb458, Sept 2020, on the - // clang 12.0 branch), but fails before that. - // Additionally it uses the __C_specific_handler function, which - // isn't implemented in wine for aarch64 yet. +#if defined(__aarch64__) && defined(__clang__) && __clang_major__ < 12 + // This test succeeds with latest clang (since 20f7773bb4bb458, Sept 2020, + // on the clang 12.0 branch), but fails before that. return 0; #else ::std::set_terminate(whoa);