root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix test/recipes/01-test_symbol_presence.t to disregard version info 

The output of 'nm -DPg' contains version info attached to the symbols,
which makes the test fail.  Simply dropping the version info makes the
test work again.

Fixes #16810 (followup)

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16840)
This commit is contained in:
Richard Levitte 2021-10-14 18:49:11 +02:00
parent 19b30f1c59
commit 73970cb91f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/recipes/01-test_symbol_presence.t
View File

@ -69,7 +69,17 @@ foreach my $libname (@libnames) {
note "Number of lines in \@def_lines before massaging: ", scalar @def_lines; note "Number of lines in \@def_lines before massaging: ", scalar @def_lines;
# Massage the nm output to only contain defined symbols # Massage the nm output to only contain defined symbols
@nm_lines = sort map { s| .*||; $_ } grep(m|.* [BCDST] .*|, @nm_lines); @nm_lines =
sort
map {
# Drop the first space and everything following it
s| .*||;
# Drop OpenSSL dynamic version information if there is any
s|\@\@OPENSSL_[0-9._]+[a-z]?$||;
# Return the result
$_
}
grep(m|.* [BCDST] .*|, @nm_lines);
# Massage the mkdef.pl output to only contain global symbols # Massage the mkdef.pl output to only contain global symbols
# The output we got is in Unix .map format, which has a global # The output we got is in Unix .map format, which has a global