diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:45:40 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:45:40 +0000 |
commit | 0bf5cc03228043e17871529b546f279910e970e2 (patch) | |
tree | 7802b245fb63aa748fdfc1595b1fb2206a8c5efa | |
parent | c8f2479c6b50e3547f3f0bd48dfa3d9dca639e29 (diff) | |
download | ruby-0bf5cc03228043e17871529b546f279910e970e2.tar.gz |
[Backport #7851]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/openssl/test_config.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb index 77f89b2bd6..1ed455c14e 100644 --- a/test/openssl/test_config.rb +++ b/test/openssl/test_config.rb @@ -16,9 +16,10 @@ __EOD__ 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 @@ -1,5 +1,5 @@ #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 |