diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-02 17:01:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-02 17:01:02 +0200 |
| commit | e546406bd08919ab62aa29905501acaf07661c63 (patch) | |
| tree | 8ec8b1da973e8bf3d5e74edd7f042d58b359b81b /lib | |
| parent | 8bfe4cab431ad8ee970dc7efa0beafa0a0c8724d (diff) | |
| parent | 85b03b8b996549631bb2aa12807243c34df28e7f (diff) | |
| download | otp-e546406bd08919ab62aa29905501acaf07661c63.tar.gz otp-e546406bd08919ab62aa29905501acaf07661c63.tar.bz2 otp-e546406bd08919ab62aa29905501acaf07661c63.zip | |
Merge branch 'ingela/ssl/kill-openssl-zombie' into maint
* ingela/ssl/kill-openssl-zombie:
ssl: Kill OpenSSL processes that survived test run
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/openssl_server_cipher_suite_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_ECC_openssl_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 8 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl index 6ce34ce7fa..0d68d84d61 100644 --- a/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl +++ b/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl @@ -177,7 +177,8 @@ init_per_suite(Config) -> end_per_suite(_Config) -> ssl:stop(), - application:stop(crypto). + application:stop(crypto), + ssl_test_lib:kill_openssl(). %%-------------------------------------------------------------------- init_per_group(GroupName, Config) -> diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl index 68d4e910fd..787c08a517 100644 --- a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl @@ -67,7 +67,8 @@ init_per_suite(Config0) -> end_per_suite(_Config) -> application:stop(ssl), - application:stop(crypto). + application:stop(crypto), + ssl_test_lib:kill_openssl(). %%-------------------------------------------------------------------- init_per_group(GroupName, Config) -> diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index a081d65200..c791f438d0 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -2496,3 +2496,11 @@ digest() -> _ -> {digest, sha1} end. + +kill_openssl() -> + case os:type() of + {unix, _} -> + os:cmd("pkill openssl"); + {win32, _} -> + os:cmd("cmd.exe /C \"taskkill /IM openssl.exe /F\"") + end. diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 07abddbcf7..31d9af5298 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -179,8 +179,8 @@ init_per_suite(Config0) -> end_per_suite(_Config) -> ssl:stop(), - application:stop(crypto). - + application:stop(crypto), + ssl_test_lib:kill_openssl(). init_per_group(GroupName, Config) -> case ssl_test_lib:is_tls_version(GroupName) of |