Skip to content

[tests] run Java.Interop-Tests on NativeAOT #10496

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[tests] run Java.Interop-Tests on NativeAOT #10496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75dcfcc
[tests] run `Java.Interop-Tests` on NativeAOT
jonathanpeppers Sep 17, 2025
1d6c463
[nativeaot] Log location of the actual p/invoke stub called
grendello Sep 19, 2025
24a6e4f
[nativeaot] Implement _monodroid_weak_gref_delete
grendello Sep 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/native/clr/host/internal-pinvokes-clr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ void monodroid_timing_stop (managed_timing_sequence *sequence, const char *messa
timing->release_sequence (sequence);
}

void _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
{
OSBridge::_monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
}

void* _monodroid_timezone_get_default_id ()
{
JNIEnv *env = OSBridge::ensure_jnienv ();
Expand Down
5 changes: 5 additions & 0 deletions src/native/clr/host/internal-pinvokes-shared.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ void _monodroid_gref_log_delete (jobject handle, char type, const char *threadNa
OSBridge::_monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);
}

void _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
{
OSBridge::_monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
}

BridgeProcessingFtn clr_initialize_gc_bridge (
BridgeProcessingStartedFtn bridge_processing_started_callback,
BridgeProcessingFinishedFtn bridge_processing_finished_callback) noexcept
Expand Down
20 changes: 7 additions & 13 deletions src/native/nativeaot/host/internal-pinvoke-stubs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ using namespace xamarin::android;

namespace {
[[gnu::noreturn]]
void pinvoke_unreachable ()
void pinvoke_unreachable (std::source_location sloc = std::source_location::current ())
{
Helpers::abort_application (LOG_DEFAULT, "The method is not implemented. This is a stub and should not be called."sv);
Helpers::abort_application (
LOG_DEFAULT,
"The p/invoke is not implemented. This is a stub and should not be called."sv,
true, // log_location
sloc
);
}
}

Expand Down Expand Up @@ -51,17 +56,6 @@ void monodroid_timing_stop (
pinvoke_unreachable ();
}

void _monodroid_weak_gref_delete (
[[maybe_unused]] jobject handle,
[[maybe_unused]] char type,
[[maybe_unused]] const char *threadName,
[[maybe_unused]] int threadId,
[[maybe_unused]] const char *from,
[[maybe_unused]] int from_writable)
{
pinvoke_unreachable ();
}

void* _monodroid_timezone_get_default_id ()
{
pinvoke_unreachable ();
Expand Down
2 changes: 0 additions & 2 deletions tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<WarningsAsErrors>IL2037</WarningsAsErrors>
<AndroidUseNegotiateAuthentication>true</AndroidUseNegotiateAuthentication>
<AndroidNdkDirectory></AndroidNdkDirectory>
<DefineConstants Condition=" '$(UseMonoRuntime)' == 'false' ">$(DefineConstants);CORECLR</DefineConstants>
<DefineConstants Condition=" '$(PublishAot)' == 'true' ">$(DefineConstants);NATIVEAOT</DefineConstants>
<!--
TODO: Fix excluded tests
For $(EnableLLVM)
Expand Down
5 changes: 0 additions & 5 deletions ...ono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,12 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
protected override IList<TestAssemblyInfo> GetTestAssemblies()
{
Assembly asm = Assembly.GetExecutingAssembly();
#if !NATIVEAOT // TODO: Java.Interop-Tests not passing yet
Assembly ji = typeof (Java.InteropTests.JavaInterop_Tests_Reference).Assembly;
#endif


return new List<TestAssemblyInfo>()
{
new TestAssemblyInfo (asm, asm.Location ?? String.Empty),
#if !NATIVEAOT
new TestAssemblyInfo (ji, ji.Location ?? String.Empty),
#endif
};
}
}
Expand Down
Loading