From a8438d3033a87f93f7a3a8c6ce32f6279ca7ad84 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 31 Oct 2015 11:16:02 +0000
Subject: [PATCH] * test/openssl/test_pair.rb: skipped tests if openssl doesn't
 support   ECDH cipher.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 | 5 +++++
 test/openssl/test_pair.rb | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ee6eb5983..ba4cd1af18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 31 20:15:48 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/openssl/test_pair.rb: skipped tests if openssl doesn't support
+	  ECDH cipher.
+
 Sat Oct 31 14:58:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* man/ruby.1 (SYNOPSIS): remove extraneous space for -F option as
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 977d11a259..932426572f 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -372,6 +372,12 @@ module OpenSSL::TestPairM
     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