rhe	2016-09-13 14:59:53 +0900 (Tue, 13 Sep 2016)

  New Revision: 56147

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

  Log:
    openssl: workaround for Ubuntu's patched OpenSSL
    
    * test/openssl/test_ssl.rb (test_ctx_options): Add a workaround for
      patched OpenSSL to fix the Ruby CI failure on Ubuntu 16.04.
      http://rubyci.s3.amazonaws.com/ubuntu/ruby-trunk/log/20160913T033003Z.fail.html.gz
      This commit is a cherry-pick of the following commit at ruby/openssl:
      https://github.com/ruby/openssl/commit/f9c04779a84b45d85dc26dc19ea600d0613539e2

  Modified files:
    trunk/test/openssl/test_ssl.rb
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 56146)
+++ test/openssl/test_ssl.rb	(revision 56147)
@@ -10,10 +10,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTes https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L10
 
     assert (OpenSSL::SSL::OP_ALL & ctx.options) == OpenSSL::SSL::OP_ALL,
            "OP_ALL is set by default"
-    ctx.options = 4
-    assert_equal 4, ctx.options
     ctx.options = nil
     assert_equal OpenSSL::SSL::OP_ALL, ctx.options
+    ctx.options = 4
+    assert_equal 4, ctx.options & 4
+    if ctx.options != 4
+      pend "SSL_CTX_set_options() seems to be modified by distributor"
+    end
 
     assert_equal true, ctx.setup
     assert_predicate ctx, :frozen?

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