diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-10-14 18:49:11 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-10-14 19:03:28 +0200 |
| commit | 73970cb91fdf8e7b4b434d479b875a47a0aa0dbc (patch) | |
| tree | ffdc870d8487c4d080edf465f019b12f0bc64af0 | |
| parent | 19b30f1c596a8df2a522f9d6dfc1c1782790fc78 (diff) | |
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)
| -rw-r--r-- | test/recipes/01-test_symbol_presence.t | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t index 12ad278e27..5be59bb7e1 100644 --- a/test/recipes/01-test_symbol_presence.t +++ b/test/recipes/01-test_symbol_presence.t @@ -69,7 +69,17 @@ foreach my $libname (@libnames) { note "Number of lines in \@def_lines before massaging: ", scalar @def_lines; # 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 # The output we got is in Unix .map format, which has a global |