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

Disable failing outerloop tests and fix a build issue in MonoAOTCompiler #89922

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Disable failing outerloop tests and fix a build issue in MonoAOTCompiler #89922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/libraries/System.Threading.Tasks/tests/Task/TaskRunSyncTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ public static void TaskRunSyncTest14()
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
[OuterLoop]
public static void TaskRunSyncTest15()
{
Expand All @@ -541,6 +542,7 @@ public static void TaskRunSyncTest16()
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
[OuterLoop]
public static void TaskRunSyncTest17()
{
Expand All @@ -550,6 +552,7 @@ public static void TaskRunSyncTest17()
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
[OuterLoop]
public static void TaskRunSyncTest18()
{
Expand All @@ -558,6 +561,7 @@ public static void TaskRunSyncTest18()
test.RealRun();
}
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
[OuterLoop]
public static void TaskRunSyncTest19()
{
Expand All @@ -567,6 +571,7 @@ public static void TaskRunSyncTest19()
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
[OuterLoop]
public static void TaskRunSyncTest20()
{
Expand All @@ -591,6 +596,7 @@ public static void TaskRunSyncTest22()
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
[OuterLoop]
public static void TaskRunSyncTest23()
{
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Threading.Tasks/tests/TaskScheduler/TaskSchedulerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ public static void RunBuggySchedulerTests()

[Fact]
[OuterLoop]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89921", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine), nameof(PlatformDetection.IsMonoRuntime))]
public static void RunSynchronizationContextTaskSchedulerTests()
{
// Remember the current SynchronizationContext, so that we can restore it
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/AndroidAppBuilder/Templates/monodroid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ Java_net_dot_MonoRunner_initRuntime (JNIEnv* env, jobject thiz, jstring j_files_
for (int i = 0; i < args_len; ++i)
{
jstring j_arg = (*env)->GetObjectArrayElement(env, j_args, i);
managed_argv[i + 1] = (*env)->GetStringUTFChars(env, j_arg, NULL);
managed_argv[i + 1] = (char*)((*env)->GetStringUTFChars(env, j_arg, NULL));
}

int res = mono_droid_runtime_init (executable, managed_argc, managed_argv, current_local_time);
Expand Down
4 changes: 3 additions & 1 deletion src/tasks/AotCompilerTask/MonoAOTCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,8 @@ private bool GenerateAotModulesTable(IEnumerable<ITaskItem> assemblies, string[]
{
writer.WriteLine($"extern void *{symbol};");
}
writer.WriteLine("void register_aot_modules ()");
writer.WriteLine("void register_aot_modules (void);");
writer.WriteLine("void register_aot_modules (void)");
writer.WriteLine("{");
foreach (var symbol in symbols)
{
Expand Down Expand Up @@ -1142,6 +1143,7 @@ private bool GenerateAotModulesTable(IEnumerable<ITaskItem> assemblies, string[]
writer.WriteLine($"extern void *{symbol};");
}

writer.WriteLine("void register_aot_modules (void);");
writer.WriteLine("void register_aot_modules (void)");
writer.WriteLine("{");
foreach (var symbol in symbols)
Expand Down
Loading