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

Fix42292 #52463

Merged
merged 2 commits into from
Jun 1, 2021
Merged

Fix42292 #52463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18809eb
Fix issue 42292
sdmaclea May 7, 2021
07cffd1
Cleanup PAL issues.targets
sdmaclea May 7, 2021
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
4 changes: 4 additions & 0 deletions src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
15 changes: 3 additions & 12 deletions src/coreclr/pal/tests/palsuite/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>