diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-18 17:56:58 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-24 17:37:14 +0200 |
| commit | a5c3feee7bfa77eb385334272505ed562c7ef0f9 (patch) | |
| tree | 46357896b61c0ae943391d7de8bcc33f0836d025 /lib/ssl/test/ssl_upgrade_SUITE.erl | |
| parent | 0cec9781bc01c7e51ecfcb2fc4f356f2cc59b03c (diff) | |
| download | otp-a5c3feee7bfa77eb385334272505ed562c7ef0f9.tar.gz otp-a5c3feee7bfa77eb385334272505ed562c7ef0f9.tar.bz2 otp-a5c3feee7bfa77eb385334272505ed562c7ef0f9.zip | |
erts: Remove halfword specific tests
Diffstat (limited to 'lib/ssl/test/ssl_upgrade_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_upgrade_SUITE.erl | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl index 17b0240fe8..fa9593b5dd 100644 --- a/lib/ssl/test/ssl_upgrade_SUITE.erl +++ b/lib/ssl/test/ssl_upgrade_SUITE.erl @@ -39,20 +39,19 @@ all() -> init_per_suite(Config0) -> catch crypto:stop(), - try {crypto:start(), erlang:system_info({wordsize, internal}) == erlang:system_info({wordsize, external})} of - {ok, true} -> - case ct_release_test:init(Config0) of - {skip, Reason} -> - {skip, Reason}; - Config -> - {ok, _} = make_certs:all(?config(data_dir, Config), - ?config(priv_dir, Config)), - ssl_test_lib:cert_options(Config) - end; - {ok, false} -> - {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} + try crypto:start() of + ok -> + case ct_release_test:init(Config0) of + {skip, Reason} -> + {skip, Reason}; + Config -> + Result = + {ok, _} = make_certs:all(?config(data_dir, Config), + ?config(priv_dir, Config)), + ssl_test_lib:cert_options(Config) + end catch _:_ -> - {skip, "Crypto did not start"} + {skip, "Crypto did not start"} end. end_per_suite(Config) -> |