diff options
| author | Lukas Larsson <[email protected]> | 2011-01-26 16:53:56 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-17 17:42:39 +0100 |
| commit | d86fa83d1fce77fc1b7bc8adc723480e79535a80 (patch) | |
| tree | 151cdaf1903250bd4aaead1ebac7e1626aa33b50 /lib/orber/test/orber_test_lib.erl | |
| parent | 3d3251d2f371499e7af7b77335b4392f4ffaa465 (diff) | |
| download | otp-d86fa83d1fce77fc1b7bc8adc723480e79535a80.tar.gz otp-d86fa83d1fce77fc1b7bc8adc723480e79535a80.tar.bz2 otp-d86fa83d1fce77fc1b7bc8adc723480e79535a80.zip | |
Update ssl orber tests to be skipped if there is no ssl installed
Diffstat (limited to 'lib/orber/test/orber_test_lib.erl')
| -rw-r--r-- | lib/orber/test/orber_test_lib.erl | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl index 132f02bb78..5053a5fddc 100644 --- a/lib/orber/test/orber_test_lib.erl +++ b/lib/orber/test/orber_test_lib.erl @@ -95,16 +95,21 @@ %% %%------------------------------------------------------------ ssl_version() -> - case catch erlang:system_info(otp_release) of - Version when is_list(Version) -> - if - "R12B" < Version -> - 3; - true -> - 2 - end; - _ -> - 2 + try + ssl:module_info(), + case catch erlang:system_info(otp_release) of + Version when is_list(Version) -> + if + "R12B" < Version -> + 3; + true -> + 2 + end; + _ -> + 2 + end + catch error:undef -> + no_ssl end. %%------------------------------------------------------------ |