From: Richard Levitte <levitte@openssl.org>
Date: Fri, 7 Jul 2017 09:10:05 +0000 (+0200)
Subject: test/recipes/90-test_shlibload.t: Make sure to handle library renames
X-Git-Tag: OpenSSL_1_1_0g~144
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e9c17ef92f66e31cee5193f6e1e449d6d197780e;p=oweals%2Fopenssl.git

test/recipes/90-test_shlibload.t: Make sure to handle library renames

VMS renames our libraries to fit VMS conventions.  This must be accounted
for when we want to load them.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3880)

(cherry picked from commit bfa3480f7609351563ac36dddd7c64e97aa6f446)
---

diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t
index 9058ba5c6d..aa8d98de29 100644
--- a/test/recipes/90-test_shlibload.t
+++ b/test/recipes/90-test_shlibload.t
@@ -22,10 +22,12 @@ plan skip_all => "Test only supported in a shared build" if disabled("shared");
 
 plan tests => 3;
 
+my $libcrypto_idx = $unified_info{rename}->{libcrypto} // "libcrypto";
+my $libssl_idx = $unified_info{rename}->{libssl} // "libssl";
 my $libcrypto =
-    $unified_info{sharednames}->{libcrypto}.$target{shared_extension_simple};
+    $unified_info{sharednames}->{$libcrypto_idx}.$target{shared_extension_simple};
 my $libssl =
-    $unified_info{sharednames}->{libssl}.$target{shared_extension_simple};
+    $unified_info{sharednames}->{$libssl_idx}.$target{shared_extension_simple};
 
 ok(run(test(["shlibloadtest", "-crypto_first", $libcrypto, $libssl])),
    "running shlibloadtest -crypto_first");