diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-11 10:40:45 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-11 10:40:45 +0100 |
| commit | c4bc990faf26a665e634362a046de2adbc37feee (patch) | |
| tree | e15198766b2bb7b7a09ee48659cdbd6d0d348ee3 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 69cbf64e5a948064e0503590c8c42443f3405ad0 (diff) | |
| parent | a609e31025b2b93d5d360879193eb6f1dac90d51 (diff) | |
| download | otp-c4bc990faf26a665e634362a046de2adbc37feee.tar.gz otp-c4bc990faf26a665e634362a046de2adbc37feee.tar.bz2 otp-c4bc990faf26a665e634362a046de2adbc37feee.zip | |
Merge branch 'ia/ssl/windows-tests' into maint
* ia/ssl/windows-tests:
ssl: Use test case time out instead
ssl: Use spawn_executable
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index f25f6f9425..9a76d603b1 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1192,13 +1192,13 @@ wait_for_openssl_server(Port, N) -> end. version_flag(tlsv1) -> - " -tls1 "; + "-tls1"; version_flag('tlsv1.1') -> - " -tls1_1 "; + "-tls1_1"; version_flag('tlsv1.2') -> - " -tls1_2 "; + "-tls1_2"; version_flag(sslv3) -> - " -ssl3 ". + "-ssl3". filter_suites(Ciphers0) -> Version = tls_record:highest_protocol_version([]), @@ -1243,3 +1243,9 @@ close_loop(Port, Time, SentClose) -> ct:log("Timeout~n",[]) end end. + +portable_open_port(Exe, Args) -> + AbsPath = os:find_executable(Exe), + ct:pal("open_port({spawn_executable, ~p}, [{args, ~p}, stderr_to_stdout]).", [AbsPath, Args]), + open_port({spawn_executable, AbsPath}, + [{args, Args}, stderr_to_stdout]). |