[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  835dd706d3a916dacdb302905899a32638ed8adc (commit)
      from  29b3fdad2b078f45f840f6e45b0fe483b77dbc6f (commit)


- Log -----------------------------------------------------------------
commit 835dd706d3a916dacdb302905899a32638ed8adc
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 15 17:43:02 2021 +0200

    TEST: Make test/recipes/01-test_symbol_presence.t more platform agnostic
    
    Assuming ".so" as shared library ending is faulty on MacOS, where the
    normal shared library extension is ".dylib".
    
    We use the platform module to get the same extension as the build process.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15771)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/01-test_symbol_presence.t | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index 9df57de421..e979c18f46 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -9,10 +9,16 @@
 
 use strict;
 use File::Spec::Functions qw(devnull);
-use OpenSSL::Test qw(:DEFAULT srctop_file bldtop_dir bldtop_file);
+use OpenSSL::Test qw(:DEFAULT srctop_file srctop_dir bldtop_dir bldtop_file);
 use OpenSSL::Test::Utils;
 
-setup("test_symbol_presence");
+BEGIN {
+    setup("test_symbol_presence");
+}
+
+use lib srctop_dir('Configurations');
+use lib bldtop_dir('.');
+use platform;
 
 plan skip_all => "Test is disabled on NonStop" if config('target') =~ m|^nonstop|;
 plan skip_all => "Only useful when building shared libraries"
@@ -33,7 +39,7 @@ note
 foreach my $libname (@libnames) {
  SKIP:
     {
-        my $shlibpath = bldtop_file("lib" . $libname . ".so");
+        my $shlibpath = bldtop_file(platform->sharedlib("lib$libname"));
         *OSTDERR = *STDERR;
         *OSTDOUT = *STDOUT;
         open STDERR, ">", devnull();