From b869182dbf69d97389c364f7ba75233fc08058fd Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Wed, 2 May 2018 15:29:02 +0200 Subject: 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. --- lib/ssl/test/ssl_test_lib.erl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/ssl') 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; -- cgit v1.2.3