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_ECC_SUITE.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_ECC_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index 3a9f21ea99..fd2afc808c 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -248,10 +248,13 @@ start_client(openssl, Port, CA, OwnCa, Cert, Key, Config) -> PrivDir = ?config(priv_dir, Config), NewCA = new_ca(filename:join(PrivDir, "new_ca.pem"), CA, OwnCa), Version = tls_record:protocol_version(tls_record:highest_protocol_version([])), - Cmd = "openssl s_client -verify 2 -port " ++ integer_to_list(Port) ++ ssl_test_lib:version_flag(Version) ++ - " -cert " ++ Cert ++ " -CAfile " ++ NewCA - ++ " -key " ++ Key ++ " -host localhost -msg -debug", - OpenSslPort = open_port({spawn, Cmd}, [stderr_to_stdout]), + Exe = "openssl", + Args = ["s_client", "-verify", "2", "-port", integer_to_list(Port), + ssl_test_lib:version_flag(Version), + "-cert", Cert, "-CAfile", NewCA, + "-key", Key, "-host","localhost", "-msg", "-debug"], + + OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), true = port_command(OpenSslPort, "Hello world"), OpenSslPort; start_client(erlang, Port, CA, _, Cert, Key, Config) -> @@ -270,10 +273,11 @@ start_server(openssl, CA, OwnCa, Cert, Key, Config) -> Port = ssl_test_lib:inet_port(node()), Version = tls_record:protocol_version(tls_record:highest_protocol_version([])), - Cmd = "openssl s_server -accept " ++ integer_to_list(Port) ++ ssl_test_lib:version_flag(Version) ++ - " -verify 2 -cert " ++ Cert ++ " -CAfile " ++ NewCA - ++ " -key " ++ Key ++ " -msg -debug", - OpenSslPort = open_port({spawn, Cmd}, [stderr_to_stdout]), + Exe = "openssl", + Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version), + "-verify", "2", "-cert ", Cert, "-CAfile", NewCA, + "-key", Key, "-msg" "-debug"], + OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), true = port_command(OpenSslPort, "Hello world"), {OpenSslPort, Port}; start_server(erlang, CA, _, Cert, Key, Config) -> |