From 6fc30554e823ae40f18ead334da069f1acba06c2 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Mon, 10 Aug 2026 18:13:09 +0200 Subject: [PATCH] Fix native validation --- .../_build/NativeValidation/NativeValidationHelper.cs | 8 ++++---- .../native-tracer-symbols-alpine-x64.verified.txt | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tracer/build/_build/NativeValidation/NativeValidationHelper.cs b/tracer/build/_build/NativeValidation/NativeValidationHelper.cs index 800a7a97fec7..587555cb19fa 100644 --- a/tracer/build/_build/NativeValidation/NativeValidationHelper.cs +++ b/tracer/build/_build/NativeValidation/NativeValidationHelper.cs @@ -59,7 +59,7 @@ void ValidateNativeLibraryGlibcCompatibility( Version FindMaxGlibcVersion(AbsolutePath libraryPath, IEnumerable allowedSymbols) { - var output = Nm.Value($"--with-symbol-versions -D {libraryPath} ").Select(x => x.Text).ToList(); + var output = Nm.Value($"--with-symbol-versions -D {libraryPath} ", logOutput: false).Select(x => x.Text).ToList(); // Gives output similar to this: // 0000000000170498 T SetGitMetadataForApplication @@ -90,7 +90,7 @@ Version FindMaxGlibcVersion(AbsolutePath libraryPath, IEnumerable allowe public void ValidateNativeSymbols(AbsolutePath libraryPath, string snapshotNamePrefix) { - var output = Nm.Value($"-D {libraryPath}").Select(x => x.Text).ToList(); + var output = Nm.Value($"-D {libraryPath}", logOutput: false).Select(x => x.Text).ToList(); // Gives output similar to this: // 0000000000006bc8 D DdDotnetFolder @@ -116,7 +116,7 @@ public void ValidateNativeSymbols(AbsolutePath libraryPath, string snapshotNameP // // We only care about the Undefined symbols - we don't want to accidentally add more of them - Logger.Debug("NM output: {Output}", string.Join(Environment.NewLine, output)); + Logger.Debug("Read {SymbolCount} dynamic symbols from {LibraryPath}", output.Count, libraryPath); var symbols = output .Select(x => x.Trim()) @@ -165,7 +165,7 @@ bool HasValidSnapshot() var received = string.Join(Environment.NewLine, symbols); var verifiedPath = BuildProjectDirectory / nameof(NativeValidation) / $"{snapshotNamePrefix}.verified.txt"; var verified = File.Exists(verifiedPath) - ? File.ReadAllText(verifiedPath) + ? File.ReadAllText(verifiedPath).TrimEnd() : string.Empty; Logger.Information("Comparing snapshot of Undefined symbols in the {LibraryName} using {Path}...", libraryName, verifiedPath); diff --git a/tracer/build/_build/NativeValidation/native-tracer-symbols-alpine-x64.verified.txt b/tracer/build/_build/NativeValidation/native-tracer-symbols-alpine-x64.verified.txt index fe7862f220fb..b7ee83405233 100644 --- a/tracer/build/_build/NativeValidation/native-tracer-symbols-alpine-x64.verified.txt +++ b/tracer/build/_build/NativeValidation/native-tracer-symbols-alpine-x64.verified.txt @@ -7,7 +7,6 @@ abort atexit bcmp btowc -ceil clock_gettime close dl_iterate_phdr @@ -149,4 +148,4 @@ wmemcpy wmemmove wmemset write -writev \ No newline at end of file +writev