Skip to content

Learn what's failing about the OSSL tests on new mac queues #114163

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

Closed
bartonjs wants to merge 7 commits into from
Closed

Learn what's failing about the OSSL tests on new mac queues #114163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21b27f2
Make debug portable builds print what dlopen errors it sees
bartonjs Apr 2, 2025
6432415
Run OSSL tests on macOS-amd64
bartonjs Apr 2, 2025
9e20f98
Update src/native/libs/System.Security.Cryptography.Native/opensslshim.c
vcsjones Apr 2, 2025
e9a67ea
Merge branch 'main' into macossl_diag
vcsjones Apr 3, 2025
e271054
Merge branch 'main' into macossl_diag
bartonjs Apr 5, 2025
3695084
Merge branch 'main' into macossl_diag
bartonjs Apr 11, 2025
59a022f
Merge branch 'main' into macossl_diag
bartonjs Apr 19, 2025
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
5 changes: 0 additions & 5 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'osx' and '$(TargetArchitecture)' == 'arm64'">
<!-- https://github.com/dotnet/dnceng/issues/3008 - osx Helix queue doesn't have OpenSSL -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.OpenSsl\tests\System.Security.Cryptography.OpenSsl.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'browser'">
<!-- Samples which are too complex for CI -->
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\console-node-ts\Wasm.Console.Node.TS.Sample.csproj" />
Expand Down
8 changes: 8 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native/opensslshim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ static void DlOpen(const char* libraryName)
{
void* libsslNew = dlopen(libraryName, RTLD_LAZY);

#ifdef DEBUG
if (libsslNew == NULL)
{
char* err = dlerror();
printf("%s\n", err);
}
#endif

// check is someone else has opened and published libssl already
if (!pal_atomic_cas_ptr(&libssl, libsslNew, NULL))
{
Expand Down