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

[RISC-V] Add riscv64 arch to tracing/eventpipe/processinfo tests #103832

Merged
merged 3 commits into from
Jun 24, 2024
Merged

[RISC-V] Add riscv64 arch to tracing/eventpipe/processinfo tests #103832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef55f8e
Add riscv64 arch to tracing/eventpipe/processinfo tests
gbalykov Jun 21, 2024
2e4bb32
Add loongarch64 to tracing/eventpipe/processinfo tests
gbalykov Jun 22, 2024
1936641
Unify architecture identification in tracing/eventpipe/processinfo tests
gbalykov Jun 24, 2024
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
10 changes: 4 additions & 6 deletions src/tests/tracing/eventpipe/processinfo/processinfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,18 +220,16 @@ public static void TestEntryPoint()
// see eventpipeeventsource.cpp for these values
string expectedArchValue = RuntimeInformation.ProcessArchitecture switch
{
Architecture.X86 => "x86",
Architecture.X64 => "x64",
Architecture.Arm => "arm32",
Architecture.Arm64 => "arm64",
_ => "Unknown"
// All other architectures match the enum member name
_ => RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant()
};

Utils.Assert(expectedArchValue.Equals(arch), $"OS must match current Operating System. Expected: \"{expectedArchValue}\", Received: \"{arch}\"");
Utils.Assert(expectedArchValue.Equals(arch), $"Arch must match current Architecture. Expected: \"{expectedArchValue}\", Received: \"{arch}\"");

Utils.Assert(end == totalSize, $"Full payload should have been read. Expected: {totalSize}, Received: {end}");

Logger.logger.Log($"\n{{\n\tprocessId: {processId},\n\truntimeCookie: {runtimeCookie},\n\tcommandLine: {commandLine},\n\tOS: {OS},\n\tArch: {arch}\n}}");
}
}
}
}
10 changes: 4 additions & 6 deletions src/tests/tracing/eventpipe/processinfo2/processinfo2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,12 @@ public static void TestEntryPoint()
// see eventpipeeventsource.cpp for these values
string expectedArchValue = RuntimeInformation.ProcessArchitecture switch
{
Architecture.X86 => "x86",
Architecture.X64 => "x64",
Architecture.Arm => "arm32",
Architecture.Arm64 => "arm64",
_ => "Unknown"
// All other architectures match the enum member name
_ => RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant()
};

Utils.Assert(expectedArchValue.Equals(arch), $"OS must match current Operating System. Expected: \"{expectedArchValue}\", Received: \"{arch}\"");
Utils.Assert(expectedArchValue.Equals(arch), $"Arch must match current Architecture. Expected: \"{expectedArchValue}\", Received: \"{arch}\"");

// VALIDATE ManagedEntrypointAssemblyName
start = end;
Expand Down Expand Up @@ -269,4 +267,4 @@ public static void TestEntryPoint()
Logger.logger.Log($"\n{{\n\tprocessId: {processId},\n\truntimeCookie: {runtimeCookie},\n\tcommandLine: {commandLine},\n\tOS: {OS},\n\tArch: {arch},\n\tManagedEntrypointAssemblyName: {managedEntrypointAssemblyName},\n\tClrProductVersion: {clrProductVersion}\n}}");
}
}
}
}
10 changes: 4 additions & 6 deletions src/tests/tracing/eventpipe/processinfo3/processinfo3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,12 @@ public static void TestEntryPoint()
// see eventpipeeventsource.cpp for these values
string expectedArchValue = RuntimeInformation.ProcessArchitecture switch
{
Architecture.X86 => "x86",
Architecture.X64 => "x64",
Architecture.Arm => "arm32",
Architecture.Arm64 => "arm64",
_ => "Unknown"
// All other architectures match the enum member name
_ => RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant()
};

Utils.Assert(expectedArchValue.Equals(arch), $"OS must match current Operating System. Expected: \"{expectedArchValue}\", Received: \"{arch}\"");
Utils.Assert(expectedArchValue.Equals(arch), $"Arch must match current Architecture. Expected: \"{expectedArchValue}\", Received: \"{arch}\"");

// VALIDATE ManagedEntrypointAssemblyName
start = end;
Expand Down Expand Up @@ -341,4 +339,4 @@ public static void TestEntryPoint()
Logger.logger.Log($"\n{{\n\tprocessId: {processId},\n\truntimeCookie: {runtimeCookie},\n\tcommandLine: {commandLine},\n\tOS: {OS},\n\tArch: {arch},\n\tManagedEntrypointAssemblyName: {managedEntrypointAssemblyName},\n\tClrProductVersion: {clrProductVersion},\n\tPortableRid: {portableRid}\n}}");
}
}
}
}