diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-05-02 15:29:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-05-02 15:29:02 +0200 |
| commit | b869182dbf69d97389c364f7ba75233fc08058fd (patch) | |
| tree | 61237edbc756e5102e86765a6588d4dca493117d | |
| parent | 6e729eb3d4edf2a2f5f0d7b0a0d36f7e3d031a40 (diff) | |
| download | otp-b869182dbf69d97389c364f7ba75233fc08058fd.tar.gz otp-b869182dbf69d97389c364f7ba75233fc08058fd.tar.bz2 otp-b869182dbf69d97389c364f7ba75233fc08058fd.zip | |
ssl: Make sure help function works from all parts of test suite
Depending on context trap_exit flag may be set or not.
So always set trap_exit and consume the EXIT signal and then set it back.
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 4022f49077..38d66d1449 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1768,9 +1768,12 @@ supports_ssl_tls_version(sslv2 = Version) -> VersionFlag = version_flag(Version), Exe = "openssl", Args = ["s_client", VersionFlag], + [{trap_exit, Trap}] = process_info(self(), [trap_exit]), + process_flag(trap_exit, true), Port = ssl_test_lib:portable_open_port(Exe, Args), Bool = do_supports_ssl_tls_version(Port, ""), consume_port_exit(Port), + process_flag(trap_exit, Trap), Bool end; |