Fix42292 (dotnet#52463)

* Fix issue 42292 * Cleanup PAL issues.targets
thaystg · Jun 1, 2021 · b802263 · b802263
1 parent 3a7c75d
commit b802263
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
@@ -5,6 +5,10 @@ endif(CLR_CMAKE_HOST_UNIX)
 # Set the RPATH of paltest_pal_sxs_test1 so that it can find dependencies without needing to set LD_LIBRARY
 # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling.
 if(CORECLR_SET_RPATH)
+ if(CLR_CMAKE_HOST_OSX)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ set(CMAKE_INSTALL_RPATH "@loader_path")
+ endif(CLR_CMAKE_HOST_OSX)
  if(CLR_CMAKE_HOST_LINUX)
  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
  set(CMAKE_INSTALL_RPATH "\$ORIGIN")

diff --git a/src/coreclr/pal/tests/palsuite/issues.targets b/src/coreclr/pal/tests/palsuite/issues.targets
@@ -24,29 +24,20 @@
  </ExcludeList>
  </ItemGroup>
 
- <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'OSX'">
+ <ItemGroup Condition="'$(TargetOS)' == 'OSX'">
  <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
  <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
  </ExcludeList>
- <ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
- <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
- </ExcludeList>
  </ItemGroup>
 
  <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">
- <ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
- <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
- </ExcludeList>
- <ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
- <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
- </ExcludeList>
  <ExcludeList Include="file_io/ReadFile/test2/paltest_readfile_test2">
  <!-- Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages. -->
- <Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
+ <Issue>https://github.com/dotnet/runtime/issues/48783</Issue>
  </ExcludeList>
  <ExcludeList Include="filemapping_memmgt/VirtualProtect/test4/paltest_virtualprotect_test4">
  <!-- Test tries to set RWX on general memory page -->
- <Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
+ <Issue>https://github.com/dotnet/runtime/issues/48783</Issue>
  </ExcludeList>
  </ItemGroup>
 </Project>