Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable test ObjCXXEHInterop_arc on Windows for Clang 16+ #233

Merged
merged 2 commits into from
Dec 14, 2022
Merged

Enable test ObjCXXEHInterop_arc on Windows for Clang 16+ #233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16eaffe
Enable test ObjCXXEHInterop_arc on Windows for Clang 16+
weliveindetail Sep 27, 2022
3fd60e3
Disable tests ARCTest_arc and PropertyIntrospectionTest2_arc on Windo…
weliveindetail Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions Test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ set(TESTS
alias.m
alignTest.m
AllocatePair.m
ARCTest_arc.m
AssociatedObject.m
AssociatedObject2.m
BlockImpTest.m
Expand All @@ -35,7 +34,6 @@ set(TESTS
PropertyAttributeTest.m
ProtocolExtendedProperties.m
PropertyIntrospectionTest.m
PropertyIntrospectionTest2_arc.m
ProtocolCreation.m
ResurrectInDealloc_arc.m
RuntimeTest.m
Expand All @@ -59,7 +57,16 @@ set(TESTS
setSuperclass.m
)

set(ENABLE_ALL_OBJC_ARC_TESTS On)

if (WIN32)
# On Windows these tests work only with more recent versions of Clang
set(ENABLE_ALL_OBJC_ARC_TESTS Off)
if (CMAKE_C_COMPILER_ID STREQUAL Clang)
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0.0)
set(ENABLE_ALL_OBJC_ARC_TESTS On)
endif()
endif()
else ()
# Don't run the tests that are specific to Itanium-style exceptions on
# Windows.
Expand All @@ -69,6 +76,13 @@ else ()
)
endif ()

if (ENABLE_ALL_OBJC_ARC_TESTS)
list(APPEND TESTS
ARCTest_arc.m
PropertyIntrospectionTest2_arc.m
)
endif()

# List of single-file tests that won't work with the legacy ABI and so
# shouldn't be run in legacy mode.
set(NEW_TESTS
Expand Down Expand Up @@ -144,9 +158,10 @@ addtest_variants("ForwardDeclareProtocolAccess" "ForwardDeclareProtocolAccess.m;
if (ENABLE_OBJCXX)
addtest_variants(ObjCXXEHInterop "ObjCXXEHInterop.mm;ObjCXXEHInterop.m" true)
addtest_variants(ObjCXXEHInteropTwice "ObjCXXEHInteropTwice.mm" true)
# This test is failing on Win32, but not for any obvious reason. Disable
# it for now to keep CI happy.
if (WIN32)
if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0.0)
addtest_variants(ObjCXXEHInterop_arc "ObjCXXEHInterop_arc.mm;ObjCXXEHInterop_arc.m" true)
endif()
else()
addtest_variants(ObjCXXEHInterop_arc "ObjCXXEHInterop_arc.mm;ObjCXXEHInterop_arc.m" true)
endif()
Expand Down