usa	2013-02-22 14:45:40 +0900 (Fri, 22 Feb 2013)

  New Revision: 39380

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

  Log:
    [Backport #7851]

  Modified files:
    branches/ruby_1_9_3/test/openssl/test_config.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39379)
+++ ruby_1_9_3/version.h	(revision 39380)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 389
+#define RUBY_PATCHLEVEL 390
 
 #define RUBY_RELEASE_DATE "2013-02-22"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/test/openssl/test_config.rb
===================================================================
--- ruby_1_9_3/test/openssl/test_config.rb	(revision 39379)
+++ ruby_1_9_3/test/openssl/test_config.rb	(revision 39380)
@@ -16,9 +16,10 @@ __EOD__ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/openssl/test_config.rb#L16
   end
 
   def test_constants
-    assert(defined?(OpenSSL::Config::DEFAULT_CONFIG_FILE))
+    config_file = OpenSSL::Config::DEFAULT_CONFIG_FILE
+    skip "DEFAULT_CONFIG_FILE may return a wrong path on your platforms. [Bug #6830]" unless File.readable?(config_file)
     assert_nothing_raised do
-      OpenSSL::Config.load(OpenSSL::Config::DEFAULT_CONFIG_FILE)
+      OpenSSL::Config.load(config_file)
     end
   end
 

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