From 51adb101844232450067c93e705c46877ef16b60 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Thu, 7 Nov 2024 08:33:59 +0000
Subject: [PATCH] Fix

---
 .../wasm/Wasm.Build.Tests/BuildTestBase.cs    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
index b61f4b13cf9220..1ea286544cd48b 100644
--- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
@@ -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());
@@ -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));