Fix the symbol_presence test with a shlib_variant
authorMatt Caswell <matt@openssl.org>
Wed, 29 Dec 2021 14:44:00 +0000 (14:44 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 30 Dec 2021 16:50:02 +0000 (16:50 +0000)
If a shlib_variant is used then the dynamic version information for
symbols will be different from what the symbol presence test was
expecting. We just make it more liberal about what it accepts as dynamic
version information.

Fixes #17366

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17372)

test/recipes/01-test_symbol_presence.t

index efe0760c25227e2e8c1180e4d1d5d62c0b3cc674..5530ade0addddbfe895554294de20ff713caffd3 100644 (file)
@@ -76,7 +76,7 @@ foreach my $libname (@libnames) {
                 # Drop the first space and everything following it
                 s| .*||;
                 # Drop OpenSSL dynamic version information if there is any
                 # Drop the first space and everything following it
                 s| .*||;
                 # Drop OpenSSL dynamic version information if there is any
-                s|\@\@OPENSSL_[0-9._]+[a-z]?$||;
+                s|\@\@.+$||;
                 # Return the result
                 $_
             }
                 # Return the result
                 $_
             }