Skip to content

Fix MarshalMethods startup logcat race in device test #12195

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

Merged
jonathanpeppers merged 4 commits into from
Jul 22, 2026
+19 −11
Merged

Fix MarshalMethods startup logcat race in device test #12195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af71a06
Fix marshal startup logcat race in device test
jonathanpeppers Jul 21, 2026
b61f54b
Handle callback exceptions in logcat monitor cleanup
jonathanpeppers Jul 21, 2026
3dcd83e
Simplify logcat cleanup exception flow
jonathanpeppers Jul 21, 2026
7e08035
Merge branch 'main' into jonathanpeppers-fix-marshal-startup-flake
jonathanpeppers Jul 21, 2026
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
24 changes: 15 additions & 9 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/DeviceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ protected TimeSpan ProfileFor (Func<bool> func, TimeSpan? timeout = null)
return stopwatch.Elapsed;
}

protected static bool MonitorAdbLogcat (Func<string, bool> action, string logcatFilePath, int timeout = 15)
protected static bool MonitorAdbLogcat (Func<string, bool> action, string logcatFilePath, int timeout = 15, Action? onMonitoringStarted = null)
{
string ext = Environment.OSVersion.Platform != PlatformID.Unix ? ".exe" : "";
string adb = Path.Combine (AndroidSdkPath, "platform-tools", "adb" + ext);
Expand Down Expand Up @@ -388,15 +388,21 @@ protected static bool MonitorAdbLogcat (Func<string, bool> action, string logcat
}
};
proc.BeginOutputReadLine ();
TimeSpan time = TimeSpan.FromSeconds (timeout);
while (!stdout_done.IsSet && !didActionSucceed && time.TotalMilliseconds > 0) {
proc.WaitForExit (10);
time -= TimeSpan.FromMilliseconds (10);
try {
onMonitoringStarted?.Invoke ();
TimeSpan time = TimeSpan.FromSeconds (timeout);
while (!stdout_done.IsSet && !didActionSucceed && time.TotalMilliseconds > 0) {
proc.WaitForExit (10);
time -= TimeSpan.FromMilliseconds (10);
}
} finally {
if (!proc.HasExited) {
proc.Kill ();
}
proc.WaitForExit ();
stdout_done.Wait ();
sw.Flush ();
}
proc.Kill ();
proc.WaitForExit ();
stdout_done.Wait ();
sw.Flush ();
return didActionSucceed;
}
}
Expand Down
6 changes: 4 additions & 2 deletions tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,15 @@ public void MarshalMethodsAppRuns ([Values (AndroidRuntime.CoreCLR, AndroidRunti

using var apkBuilder = CreateApkBuilder ();
Assert.True (apkBuilder.Install (proj), "Project should have installed.");
RunProjectAndAssert (proj, apkBuilder);
ClearAdbLogcat ();

const string expectedLogcatOutput = "XXX:OnStart done";
Assert.IsTrue (
MonitorAdbLogcat (
InstallAndRunTests.CreateLineChecker (expectedLogcatOutput),
logcatFilePath: Path.Combine (Root, apkBuilder.ProjectDirectory, "startup-logcat.log"), timeout: 60
logcatFilePath: Path.Combine (Root, apkBuilder.ProjectDirectory, "startup-logcat.log"),
timeout: 60,
onMonitoringStarted: () => StartActivityAndAssert (proj)
),
$"Output did not contain {expectedLogcatOutput}!"
);
Expand Down
Loading