nagachika	2014-09-04 00:21:34 +0900 (Thu, 04 Sep 2014)

  New Revision: 47375

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

  Log:
    merge revision(s) r47362: [Backport #9984]
    
    * test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
      added timeout into testcase for low performance environment.
      [Bug #9984][ruby-core:63367]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/openssl/test_pkey_rsa.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47374)
+++ ruby_2_1/ChangeLog	(revision 47375)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Sep  4 00:21:05 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
+	  added timeout into testcase for low performance environment.
+	  [Bug #9984][ruby-core:63367]
+
 Tue Sep  2 02:21:58 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (env_aset, env_has_key, env_assoc, env_has_value),
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47374)
+++ ruby_2_1/version.h	(revision 47375)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-09-02"
-#define RUBY_PATCHLEVEL 218
+#define RUBY_RELEASE_DATE "2014-09-04"
+#define RUBY_PATCHLEVEL 219
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/openssl/test_pkey_rsa.rb
===================================================================
--- ruby_2_1/test/openssl/test_pkey_rsa.rb	(revision 47374)
+++ ruby_2_1/test/openssl/test_pkey_rsa.rb	(revision 47375)
@@ -77,7 +77,7 @@ class OpenSSL::TestPKeyRSA < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/openssl/test_pkey_rsa.rb#L77
 
   def test_sign_verify_memory_leak
     bug9743 = '[ruby-core:62038] [Bug #9743]'
-    assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true)
+    assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true, timeout: 30)
     data = 'Sign me!'
     digest = OpenSSL::Digest::SHA512.new
     pkey = OpenSSL::PKey::RSA.new(2048)
@@ -89,7 +89,7 @@ class OpenSSL::TestPKeyRSA < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/openssl/test_pkey_rsa.rb#L89
     }
     CODE
 
-    assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true)
+    assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true, timeout: 30)
     data = 'Sign me!'
     digest = OpenSSL::Digest::SHA512.new
     pkey = OpenSSL::PKey::RSA.new(2048)

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47362


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