nagachika	2015-02-13 23:16:02 +0900 (Fri, 13 Feb 2015)

  New Revision: 49588

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

  Log:
    merge revision(s) r49575,r49579: [Backport #10839]
    
    test_cipher.rb: show cipher name
    
    * test/openssl/test_cipher.rb (test_ciphers): show wrap mode
      cipher name, which does not end with "wrap".
      http://rubyci.blob.core.windows.net/fedora21/ruby-trunk/log/20150212T061502Z.fail.html.gz

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/openssl/test_cipher.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49587)
+++ ruby_2_1/version.h	(revision 49588)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-02-09"
-#define RUBY_PATCHLEVEL 291
+#define RUBY_RELEASE_DATE "2015-02-13"
+#define RUBY_PATCHLEVEL 292
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 13
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/openssl/test_cipher.rb
===================================================================
--- ruby_2_1/test/openssl/test_cipher.rb	(revision 49587)
+++ ruby_2_1/test/openssl/test_cipher.rb	(revision 49588)
@@ -107,7 +107,7 @@ class OpenSSL::TestCipher < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/openssl/test_cipher.rb#L107
         begin
           assert_kind_of(OpenSSL::Cipher::Cipher, OpenSSL::Cipher::Cipher.new(name))
         rescue OpenSSL::Cipher::CipherError => e
-          next if /wrap\z/ =~ name and e.message == 'wrap mode not allowed'
+          next if /wrap/ =~ name and e.message == 'wrap mode not allowed'
           raise
         end
       }

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49575,49579


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