Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/tests/Common/CoreCLRTestLibrary/Utilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public static bool IsWindowsIoTCore

// return whether or not the OS is a 64 bit OS
public static bool Is64 => (IntPtr.Size == 8);
public static bool Is32 => (IntPtr.Size == 4);

public static bool IsMonoRuntime => Type.GetType("Mono.RuntimeStructs") != null;
public static bool IsNotMonoRuntime => !IsMonoRuntime;
Expand Down
27 changes: 17 additions & 10 deletions src/tests/Interop/StringMarshalling/UTF8/UTF8Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -255,24 +255,31 @@ public static void TestEntryPoint()
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringTests.TestStringPassByRef(utf8Strings[i], i);

// https://github.com/dotnet/runtime/issues/123529
if (!TestLibrary.Utilities.IsNativeAot)
{
// Test StringBuilder as [In,Out] parameter
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringBuilderTests.TestInOutStringBuilderParameter(utf8Strings[i], i);

// Test StringBuilder as [In,Out] parameter
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringBuilderTests.TestInOutStringBuilderParameter(utf8Strings[i], i);

// Test StringBuilder as [Out] parameter
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringBuilderTests.TestOutStringBuilderParameter(utf8Strings[i], i);
// Test StringBuilder as [Out] parameter
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringBuilderTests.TestOutStringBuilderParameter(utf8Strings[i], i);
}

// utf8 string as struct fields
UTF8StructMarshalling.TestUTF8StructMarshalling(utf8Strings);

// delegate
UTF8DelegateMarshalling.TestUTF8DelegateMarshalling();

// Test StringBuilder as [Out] parameter
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringBuilderTests.TestReturnStringBuilder(utf8Strings[i], i);
// https://github.com/dotnet/runtime/issues/123529
if (!TestLibrary.Utilities.IsNativeAot)
{
// Test StringBuilder as [Out] parameter
for (int i = 0; i < utf8Strings.Length - 1; i++)
UTF8StringBuilderTests.TestReturnStringBuilder(utf8Strings[i], i);
}

// String.Empty tests
UTF8StringTests.EmptyStringTest();
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/Methodical/jitinterface/bug603649.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class foo
private static object s_o = typeof(string);
[Fact]
[OuterLoop]
[ActiveIssue("https://github.com/dotnet/runtime/issues/122013", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot), nameof(TestLibrary.Utilities.Is32))]
public static int TestEntryPoint()
{
bool f = typeof(string) == s_o as Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public class Test
{
[OuterLoop]
[Fact]
// This needs a CoreCLR TypeLoadException emulator
[ActiveIssue("https://github.com/dotnet/runtime/issues/69919", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot))]
public static int TestEntryPoint()
{
if ((TestManyFields() == 100)
Expand Down
Loading