Skip to content

Don't drop the warning/error code and type when overriding by binlog #109607

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
ilonatommy merged 1 commit into from
Nov 7, 2024
Merged

Don't drop the warning/error code and type when overriding by binlog #109607

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
23 changes: 22 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,10 @@ public BuildTestBase(ProjectProviderBase providerBase, ITestOutputHelper output,
buildRoot.VisitAllChildren<TextNode>(m =>
{
if (m is Message || m is Error || m is Warning)
outputBuilder.AppendLine(m.Title);
{
var context = GetBinlogMessageContext(m);
outputBuilder.AppendLine($"{context}{m.Title}");
}
});

res = new CommandResult(res.StartInfo, res.ExitCode, outputBuilder.ToString());
Expand All @@ -198,6 +201,24 @@ public BuildTestBase(ProjectProviderBase providerBase, ITestOutputHelper output,
return (res, logFilePath);
}

private string GetBinlogMessageContext(TextNode node)
{
var currentNode = node;
while (currentNode != null)
{
if (currentNode is Error error)
{
return $"{error.File}({error.LineNumber},{error.ColumnNumber}): error {error.Code}: ";
}
else if (currentNode is Warning warning)
{
return $"{warning.File}({warning.LineNumber},{warning.ColumnNumber}): warning {warning.Code}: ";
}
currentNode = currentNode.Parent as TextNode;
}
return string.Empty;
}

protected bool IsDotnetWasmFromRuntimePack(BuildArgs buildArgs) =>
!(buildArgs.AOT || (buildArgs.Config == "Release" && IsUsingWorkloads));

Expand Down