-
Notifications
You must be signed in to change notification settings - Fork 402
Reapply new SOS test harness #6008
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2c7616a
Reapply new SOS test harness
steveisok 2b71b26
Temporarily skip SOS.Tests in CI
steveisok 3d26d91
Gate SOS.Tests CI skip on OfficialBuildId
steveisok ff8bd3a
Forward build properties to test invocation
steveisok 5223b74
Skip SOS apphost chmod with tests
steveisok 3dcb89c
Forward build properties to Windows tests
steveisok File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using SOS.TestHarness; | ||
|
|
||
| // Out-of-process desktop-dump capturer. Runs the risky in-process dbgeng live-debugging work in | ||
| // a short-lived child process so it can never crash the test host. See CaptureCli for usage. | ||
| return CaptureCli.Run(args); |
17 changes: 17 additions & 0 deletions
17
src/tests/SOS.TestHarness.Capturer/SOS.TestHarness.Capturer.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>$(NetCoreAppTestTargetFramework)</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <LangVersion>latest</LangVersion> | ||
| <AssemblyName>SOS.TestHarness.Capturer</AssemblyName> | ||
| <RuntimeIdentifier>$(TargetRid)</RuntimeIdentifier> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\SOS.TestHarness\SOS.TestHarness.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using SOS.TestHarness; | ||
|
|
||
| // The EngineHost child process: hosts dbgeng IN THIS PROCESS (reusing the in-process host | ||
| // classes) and serves commands over a stdin/stdout REPL. The test host spawns one of these per | ||
| // target and talks to it via EngineProtocol, so the test host itself never loads dbgeng/SOS/DAC — | ||
| // which is what was crashing it (ExecutionEngineException). If the engine corrupts THIS process, | ||
| // only this child dies and the test sees a clean failure. | ||
| // | ||
| // Usage: | ||
| // EngineHost dump <dumpPath> | ||
| // EngineHost live <exePath> | ||
|
|
||
| return EngineHostMain.Run(args); | ||
|
|
||
| internal static class EngineHostMain | ||
| { | ||
| public static int Run(string[] args) | ||
| { | ||
| if (args.Length < 1) | ||
| { | ||
| Console.Error.WriteLine("usage: EngineHost <dump <dumpPath> | live <exePath>>"); | ||
| return 2; | ||
| } | ||
|
|
||
| IDebuggerHost host; | ||
| DbgEngLiveHost? liveHost = null; | ||
| try | ||
| { | ||
| switch (args[0]) | ||
| { | ||
| case "dump" when args.Length == 2: | ||
| host = new DbgEngDumpHost(args[1]); | ||
| host.LoadSos(); | ||
| break; | ||
|
|
||
| case "live" when args.Length == 2: | ||
| liveHost = new DbgEngLiveHost(args[1]); // launches, breaks, loads SOS | ||
| host = liveHost; | ||
| break; | ||
|
|
||
| default: | ||
| Console.Error.WriteLine("invalid arguments"); | ||
| return 2; | ||
| } | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Console.Error.WriteLine("engine open failed: " + ex); | ||
| return 1; | ||
| } | ||
|
|
||
| // Signal that the target is open and SOS is ready. | ||
| Console.Out.WriteLine(EngineProtocol.Ready); | ||
| Console.Out.Flush(); | ||
|
|
||
| try | ||
| { | ||
| string? line; | ||
| while ((line = Console.In.ReadLine()) is not null) | ||
| { | ||
| if (line.Length == 0) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| try | ||
| { | ||
| SosOutput result; | ||
| if (line.StartsWith(EngineProtocol.RunToBpmdPrefix, StringComparison.Ordinal)) | ||
| { | ||
| if (liveHost is null) | ||
| { | ||
| throw new InvalidOperationException("runtobpmd is only valid for a live engine."); | ||
| } | ||
|
|
||
| string[] parts = line[EngineProtocol.RunToBpmdPrefix.Length..].Split(' ', 2); | ||
| result = liveHost.RunToBpmd(parts[0], parts[1]); | ||
| } | ||
| else if (line == EngineProtocol.RunToCrash) | ||
| { | ||
| if (liveHost is null) | ||
| { | ||
| throw new InvalidOperationException("runtocrash is only valid for a live engine."); | ||
| } | ||
|
|
||
| result = liveHost.RunToCrash(); | ||
| } | ||
| else if (line == EngineProtocol.RunToBreak) | ||
| { | ||
| if (liveHost is null) | ||
| { | ||
| throw new InvalidOperationException("runtobreak is only valid for a live engine."); | ||
| } | ||
|
|
||
| result = liveHost.RunToBreakpoint(); | ||
| } | ||
| else | ||
| { | ||
| result = host.Execute(line); | ||
| } | ||
|
|
||
| Console.Out.Write(result.Text); | ||
| if (!result.Text.EndsWith('\n')) | ||
| { | ||
| Console.Out.Write('\n'); | ||
| } | ||
|
|
||
| Console.Out.WriteLine(EngineProtocol.End); | ||
| Console.Out.Flush(); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Console.Out.WriteLine(ex.Message); | ||
| Console.Out.WriteLine(EngineProtocol.Error); | ||
| Console.Out.Flush(); | ||
| } | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| host.Dispose(); | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
src/tests/SOS.TestHarness.EngineHost/SOS.TestHarness.EngineHost.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>$(NetCoreAppTestTargetFramework)</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <LangVersion>latest</LangVersion> | ||
| <AssemblyName>SOS.TestHarness.EngineHost</AssemblyName> | ||
| <RuntimeIdentifier>$(TargetRid)</RuntimeIdentifier> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\SOS.TestHarness\SOS.TestHarness.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.