Skip to content

Testing main, adding in net7.0 testing #3127

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
mikem8361 merged 12 commits into from
Jul 2, 2022
Merged

Testing main, adding in net7.0 testing #3127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
80e82d4
Testing main, adding in net7.0 testing
mikelle-rogers Feb 1, 2022
c84b990
Update test SDK to version with SOS buffer fixes
hoyosjs Jun 22, 2022
d960c5a
Fix wrong xml
hoyosjs Jun 22, 2022
a86ca3d
Code review feedback
Jun 23, 2022
b71d2cb
More code review feedback
Jun 23, 2022
07c0969
Code review feedback and made changes to SOS runner to use the local …
Jun 23, 2022
5c1e8d3
Undo webapp3 TargetFrameworks change
Jun 23, 2022
290f73e
Undo my previous undo
Jun 23, 2022
c3e37e0
Disable checking GCFreeSegment callbacks on 7.0
Jun 24, 2022
9ecc8a2
Add singlefile to test helper (like SOSRunner) log names
Jun 24, 2022
f7740f1
Update SDK/runtime versions
Jul 1, 2022
bd6eee9
Disable eeversion test on 7.0
Jul 1, 2022
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
Prev Previous commit
Next Next commit
Disable checking GCFreeSegment callbacks on 7.0
  • Loading branch information
Mike McLaughlin committed Jul 1, 2022
commit c3e37e00e6efe4bf2d06afcd29f3325f5b01434a
6 changes: 3 additions & 3 deletions src/tests/dotnet-stack/StackTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class StackTests
{
private readonly ITestOutputHelper _output;

private readonly string _correctStack70 = @" [Native Frames]
private const string _correctStack70 = @" [Native Frames]
System.Console.il!Interop+Kernel32.ReadFile(int,unsigned int8*,int32,int32&,int)
System.Console.il!System.ConsolePal+WindowsConsoleStream.ReadFileNative(int,value class System.Span`1<unsigned int8>,bool,int32&,bool)
System.Console.il!System.ConsolePal+WindowsConsoleStream.Read(value class System.Span`1<unsigned int8>)
Expand All @@ -31,7 +31,7 @@ public class StackTests
System.Console.il!System.Console.Read()
?!?";

private readonly string _correctStack60 = @" [Native Frames]
private const string _correctStack60 = @" [Native Frames]
System.Console.il!System.ConsolePal+WindowsConsoleStream.ReadFileNative(int,value class System.Span`1<unsigned int8>,bool,int32&,bool)
System.Console.il!System.ConsolePal+WindowsConsoleStream.Read(value class System.Span`1<unsigned int8>)
System.Console.il!System.IO.ConsoleStream.Read(unsigned int8[],int32,int32)
Expand All @@ -41,7 +41,7 @@ public class StackTests
System.Console.il!System.Console.Read()
StackTracee!Tracee.Program.Main(class System.String[])";

private readonly string _correctStack31 = @" [Native Frames]
private const string _correctStack31 = @" [Native Frames]
System.Console.il!System.ConsolePal+WindowsConsoleStream.ReadFileNative(int,unsigned int8[],int32,int32,bool,int32&,bool)
System.Console.il!System.ConsolePal+WindowsConsoleStream.Read(unsigned int8[],int32,int32)
System.Private.CoreLib.il!System.IO.StreamReader.ReadBuffer()
Expand Down
5 changes: 4 additions & 1 deletion src/tests/eventpipe/GCEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ await RemoteTestExecutorHelper.RunTestCaseAsync(() =>
List<string> testList = new List<string>();
for (int i = 0; i < 100_000_000; i ++)
{
// This test was failing (no GCFreeSegment callbacks) on x86 until this GC Collects happened.
if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
{
if (i % 1_000_000 == 0)
Expand Down Expand Up @@ -225,7 +226,9 @@ await RemoteTestExecutorHelper.RunTestCaseAsync(() =>

Logger.logger.Log("GCCreateSegmentEvents: " + GCCreateSegmentEvents);
Logger.logger.Log("GCFreeSegmentEvents: " + GCFreeSegmentEvents);
bool GCSegmentResult = GCCreateSegmentEvents > 0 && GCFreeSegmentEvents > 0;

// Disable checking GCFreeSegmentEvents on .NET 7.0 issue: https://github.com/dotnet/diagnostics/issues/3143
bool GCSegmentResult = GCCreateSegmentEvents > 0 && (GCFreeSegmentEvents > 0 || Environment.Version.Major >= 7);
Logger.logger.Log("GCSegmentResult: " + GCSegmentResult);

Logger.logger.Log("GCAllocationTickEvents: " + GCAllocationTickEvents);
Expand Down