diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-03-09 08:55:14 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-03-09 08:55:14 +0100 |
| commit | f2d39216e0587db58b5a79c78bfe94b00334cd0d (patch) | |
| tree | 5ec03fd69b6ff995d8a0edfb5d68b29bac1d1ead | |
| parent | 444ca955aa7ca90cf5e2621bc5324b96a0c24947 (diff) | |
| parent | be0f9642199c9a0d4ce2a98276f7b783a71d90f5 (diff) | |
| download | otp-f2d39216e0587db58b5a79c78bfe94b00334cd0d.tar.gz otp-f2d39216e0587db58b5a79c78bfe94b00334cd0d.tar.bz2 otp-f2d39216e0587db58b5a79c78bfe94b00334cd0d.zip | |
Merge branch 'ia/ssl/soft-upgrade-test-server-bug-workaround'
* ia/ssl/soft-upgrade-test-server-bug-workaround:
ssl: Workaround test server halfwordemulator bug
| -rw-r--r-- | lib/ssl/test/ssl_upgrade_SUITE.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl index 6a6a1b4a7a..c83fb367dc 100644 --- a/lib/ssl/test/ssl_upgrade_SUITE.erl +++ b/lib/ssl/test/ssl_upgrade_SUITE.erl @@ -38,8 +38,8 @@ all() -> init_per_suite(Config0) -> catch crypto:stop(), - try crypto:start() of - ok -> + 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}; @@ -49,7 +49,9 @@ init_per_suite(Config0) -> ?config(priv_dir, Config))), ct:log("Make certs ~p~n", [Result]), ssl_test_lib:cert_options(Config) - end + end; + {ok, false} -> + {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} catch _:_ -> {skip, "Crypto did not start"} end. |