Merge branch 'ia/ssl/test-maint' into maint

* ia/ssl/test-maint: ssl: Add missing configuration in test case
erlang · Mar 13, 2013 · 03bc63b · 03bc63b
2 parents 4955bf9 + e4b753f
commit 03bc63b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1202,8 +1202,8 @@ start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenS
                     {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
                     {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
-    Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port)  ++
+    Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
     " -host localhost",
 
     ct:print("openssl cmd: ~p~n", [Cmd]),