hsbt	2015-10-31 20:16:02 +0900 (Sat, 31 Oct 2015)

  New Revision: 52412

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52412

  Log:
    * test/openssl/test_pair.rb: skipped tests if openssl doesn't support
      ECDH cipher.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_pair.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52411)
+++ ChangeLog	(revision 52412)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct 31 20:15:48 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* test/openssl/test_pair.rb: skipped tests if openssl doesn't support
+	  ECDH cipher.
+
 Sat Oct 31 14:58:10 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* man/ruby.1 (SYNOPSIS): remove extraneous space for -F option as
Index: test/openssl/test_pair.rb
===================================================================
--- test/openssl/test_pair.rb	(revision 52411)
+++ test/openssl/test_pair.rb	(revision 52412)
@@ -372,6 +372,12 @@ module OpenSSL::TestPairM https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pair.rb#L372
     accepted = s2.accept
 
     assert called, 'ecdh callback should be called'
+  rescue OpenSSL::SSL::SSLError => e
+    if e.message =~ /no cipher match/
+      skip "ECDH cipher not supported."
+    else
+      raise e
+    end
   ensure
     th.join if th
     s1.close if s1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/