Skip to content

Commit b802263

Browse files
authored
Fix42292 (#52463)
* Fix issue 42292 * Cleanup PAL issues.targets
1 parent 3a7c75d commit b802263

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ endif(CLR_CMAKE_HOST_UNIX)
55
# Set the RPATH of paltest_pal_sxs_test1 so that it can find dependencies without needing to set LD_LIBRARY
66
# For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling.
77
if(CORECLR_SET_RPATH)
8+
if(CLR_CMAKE_HOST_OSX)
9+
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
10+
set(CMAKE_INSTALL_RPATH "@loader_path")
11+
endif(CLR_CMAKE_HOST_OSX)
812
if(CLR_CMAKE_HOST_LINUX)
913
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
1014
set(CMAKE_INSTALL_RPATH "\$ORIGIN")

src/coreclr/pal/tests/palsuite/issues.targets

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,20 @@
2424
</ExcludeList>
2525
</ItemGroup>
2626

27-
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'OSX'">
27+
<ItemGroup Condition="'$(TargetOS)' == 'OSX'">
2828
<ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
2929
<Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
3030
</ExcludeList>
31-
<ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
32-
<Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
33-
</ExcludeList>
3431
</ItemGroup>
3532

3633
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">
37-
<ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
38-
<Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
39-
</ExcludeList>
40-
<ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
41-
<Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
42-
</ExcludeList>
4334
<ExcludeList Include="file_io/ReadFile/test2/paltest_readfile_test2">
4435
<!-- Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages. -->
45-
<Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
36+
<Issue>https://github.com/dotnet/runtime/issues/48783</Issue>
4637
</ExcludeList>
4738
<ExcludeList Include="filemapping_memmgt/VirtualProtect/test4/paltest_virtualprotect_test4">
4839
<!-- Test tries to set RWX on general memory page -->
49-
<Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
40+
<Issue>https://github.com/dotnet/runtime/issues/48783</Issue>
5041
</ExcludeList>
5142
</ItemGroup>
5243
</Project>

0 commit comments

Comments
 (0)