diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-03 18:48:23 +0100 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-11-04 00:19:50 +0100 |
| commit | 8f8e9f184bf51fa283c1af9c4fd63098fc7387dd (patch) | |
| tree | 5c985057ab74b7f8fd0d2c77fae3286daa291b83 /test/recipes | |
| parent | 0d325d9cb9ecb10cb1d41f64751ca8d8f2df472b (diff) | |
Don't assume to know the shared library extension
test/shlibloadtest.c assumes all Unix style platforms use .so as
shared library extension. This is not the case for Mac OS X, which
uses .dylib. Instead of this, have the test recipe find out the
extension from configuration data.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1844)
(cherry picked from commit 62dd3351a16089aedb0f1e62e3b6df371c93389c)
Diffstat (limited to 'test/recipes')
| -rw-r--r-- | test/recipes/90-test_shlibload.t | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t index dc356137ef..9058ba5c6d 100644 --- a/test/recipes/90-test_shlibload.t +++ b/test/recipes/90-test_shlibload.t @@ -22,16 +22,15 @@ plan skip_all => "Test only supported in a shared build" if disabled("shared"); plan tests => 3; -ok(run(test(["shlibloadtest", "-crypto_first", - $unified_info{sharednames}->{libcrypto}, - $unified_info{sharednames}->{libssl}])), +my $libcrypto = + $unified_info{sharednames}->{libcrypto}.$target{shared_extension_simple}; +my $libssl = + $unified_info{sharednames}->{libssl}.$target{shared_extension_simple}; + +ok(run(test(["shlibloadtest", "-crypto_first", $libcrypto, $libssl])), "running shlibloadtest -crypto_first"); -ok(run(test(["shlibloadtest", "-ssl_first", - $unified_info{sharednames}->{libcrypto}, - $unified_info{sharednames}->{libssl}])), +ok(run(test(["shlibloadtest", "-ssl_first", $libcrypto, $libssl])), "running shlibloadtest -ssl_first"); -ok(run(test(["shlibloadtest", "-just_crypto", - $unified_info{sharednames}->{libcrypto}, - $unified_info{sharednames}->{libssl}])), +ok(run(test(["shlibloadtest", "-just_crypto", $libcrypto, $libssl])), "running shlibloadtest -just_crypto"); |