Skip to content

Fix native validation #9020

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

Draft
NachoEchevarria wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −6
Draft

Fix native validation #9020

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions tracer/build/_build/NativeValidation/NativeValidationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void ValidateNativeLibraryGlibcCompatibility(

Version FindMaxGlibcVersion(AbsolutePath libraryPath, IEnumerable<string> 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
Expand Down Expand Up @@ -90,7 +90,7 @@ Version FindMaxGlibcVersion(AbsolutePath libraryPath, IEnumerable<string> 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
Expand All @@ -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())
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions tracer/build/_build/NativeValidation/native-tracer-symbols-alpine-x64.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ abort
atexit
bcmp
btowc
ceil
clock_gettime
close
dl_iterate_phdr
Expand Down Expand Up @@ -149,4 +148,4 @@ wmemcpy
wmemmove
wmemset
write
writev
writev
Loading