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

[tests] Add MonoApi runtime tests #65221

Merged
merged 42 commits into from
Mar 4, 2022
Merged

[tests] Add MonoApi runtime tests #65221

merged 42 commits into from
Mar 4, 2022

Conversation

lambdageek
Copy link
Member

@lambdageek lambdageek commented Feb 11, 2022 •
edited

Contributes to #64456

Create a new directory src/tests/Interop/MonoAPI for tests that use the mono embedding API.

Move the mono libtest.c native library along with managed tests: InstallEHCallback.cs, PInvokeDetach.cs and Thunks.cs to src/tests/Interop/MonoAPI/...

The native library (now called mono-embedding-api-test.c) builds on all platforms where we build native support libraries for the runtime tests.

The managed tests only run on desktop mono configurations for now.

@ghost ghost assigned lambdageek Feb 11, 2022
@lambdageek lambdageek added NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) and removed area-Build-mono labels Feb 11, 2022
@lambdageek lambdageek force-pushed the add-monoapi-runtime-tests branch 7 times, most recently from 00af384 to 7bbc8db Compare February 16, 2022 16:26
@lambdageek lambdageek mentioned this pull request Feb 16, 2022
Closed
3 tasks
@lambdageek lambdageek force-pushed the add-monoapi-runtime-tests branch 3 times, most recently from 2d5c50e to 9cb521d Compare February 24, 2022 03:55
@runfoapp runfoapp bot mentioned this pull request Feb 24, 2022
Open
lambdageek and others added 14 commits March 1, 2022 15:01
@lambdageek
copy libtest.c from mono to src/tests and add cmake
9e5a43b
@lambdageek
XXX HACK - find the runtime headers
529d3ef
@lambdageek
builds, but doesn't link (needs eglib)
e521ae5 
Fixed C++ compilation issues.
@lambdageek
XXX link eglib into embedded API test shared lib
beb006e 
More ugly hacks.
@lambdageek
Make it build with the monoapi project
09c9d21
@lambdageek
Adjust to src/native/monoapi path
3bd805b
@lambdageek
test: remove mono-compiler.h dependency
baa02eb
@lambdageek
Remove dependency on gmodule.h
a4a5c00 
Had to copy the w32_find_symbol code that searches for a symbol in every module.
@lambdageek
Remove test library eglib dependency
bdfc029 
Delete some unrunnable tests.

Copy some basic eglib utilities into the test.
@lambdageek
Move native embedding API test lib to Interop/MonoAPI/Native
243d879
@lambdageek
Move install_eh_callback test to src/tests/Interop/MonoAPI/MonoMono
c18a64f
@lambdageek
HACK: dlopen("libcoreclr.dylib")
c2acead 
Maybe get the module name from managed, based on platform, instead?
@lambdageek
add issues.targets excludes for MonoAPI tests
7d298df 
Not expected to run on coreclr or mono on wasm or mobile, for now.
@lambdageek
Add PInvokeDetach MonoAPI test
a3afdc6
@lambdageek lambdageek marked this pull request as ready for review March 1, 2022 20:29
@lambdageek lambdageek added area-Interop-mono and removed NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) labels Mar 1, 2022
@lambdageek lambdageek requested a review from vargaz March 1, 2022 20:31
@lambdageek
Copy link
Member Author

lambdageek commented Mar 1, 2022 •
edited

/cc @dotnet/interop-contrib @trylek I'd love some feedback on the overall setup for these tests

@lambdageek lambdageek changed the title [DRAFT] Add MonoApi runtime tests [tests] Add MonoApi runtime tests Mar 1, 2022
@lambdageek
Copy link
Member Author

@lateralusX I kept most of the win32 code from libtest.c, and I believe the native library is building as part of the coreclr win32 tests build, but I haven't tried running the tests on Windows Mono.

AaronRobinsonMSFT
AaronRobinsonMSFT approved these changes Mar 2, 2022
View reviewed changes
src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/api-functions.h
@@ -0,0 +1,6 @@
// This file intentionally doesn't have header guards
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing MIT banner.

src/tests/Interop/MonoAPI/MonoMono/Thunks.cs
@@ -2,9 +2,11 @@
using System.Reflection;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing MIT banner.

src/tests/Interop/MonoAPI/MonoMono/PInvokeDetach.cs
@@ -7,14 +7,33 @@
using System.Threading;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing MIT banner.

src/tests/Interop/MonoAPI/MonoMono/InstallEHCallback.cs
@@ -2,19 +2,21 @@
using System.Runtime.InteropServices;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing MIT banner.

src/tests/Interop/MonoAPI/Common/MonoAPISupport.cs
@@ -0,0 +1,32 @@
using System;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing MIT banner.

src/tests/Interop/CMakeLists.txt Outdated
@@ -102,3 +102,5 @@ if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
add_subdirectory(ObjectiveC/AutoReleaseTest)
add_subdirectory(ObjectiveC/ObjectiveCMarshalAPI)
endif()

add_subdirectory(MonoAPI/Native)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's move this up to before the first if branch since it should be always done and with that "group".

src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/mono-embedding-api-test.c
@@ -0,0 +1,1088 @@

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing MIT banner.

@lateralusX
Copy link
Member

@lateralusX I kept most of the win32 code from libtest.c, and I believe the native library is building as part of the coreclr win32 tests build, but I haven't tried running the tests on Windows Mono.

OK, I can look at that once the PR has been merged.

@lambdageek
Copy link
Member Author

Interesting, thunks test failure on llvmaot is relevant. need to check if that test ran with aot in mono/mono

@lambdageek
Copy link
Member Author

Interesting, thunks test failure on llvmaot is relevant. need to check if that test ran with aot in mono/mono

Yea, we skipped that test on AOT configurations in mono/mono

This was referenced Mar 3, 2022
Closed
Closed
Closed
@lambdageek
skip Thunks test on AOT
8e3aa5e 
In the mono/mono repo that test was not expected to work with AOT
@lambdageek lambdageek merged commit 483b8f2 into dotnet:main Mar 4, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Apr 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jkoritzinsky jkoritzinsky jkoritzinsky left review comments

@vargaz vargaz vargaz approved these changes

@AaronRobinsonMSFT AaronRobinsonMSFT AaronRobinsonMSFT approved these changes

@marek-safar marek-safar Awaiting requested review from marek-safar marek-safar is a code owner

Assignees

@lambdageek lambdageek

Labels
area-Interop-mono
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lambdageek @lateralusX @vargaz @jkoritzinsky @AaronRobinsonMSFT