summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/openssl/test_config.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f5fdcdb5d5..1eca24f59a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 9 12:37:22 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * test/openssl/test_config.rb (OpenSSL#test_constants): skip this
+ test if platform is Mac OS X or Windows. [Bug #6830]
+
Wed Aug 8 22:51:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (eval_under): singletons other than special constants
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
index 2e29883c00..604ccaa639 100644
--- a/test/openssl/test_config.rb
+++ b/test/openssl/test_config.rb
@@ -21,6 +21,8 @@ __EOD__
end
def test_constants
+ skip "DEFAULT_CONFIG_FILE may return a wrong path on your platforms. [Bug #6830]" if /mswin|mingw|darwin/ =~ RUBY_PLATFORM
+
assert(defined?(OpenSSL::Config::DEFAULT_CONFIG_FILE))
assert_nothing_raised do
OpenSSL::Config.load(OpenSSL::Config::DEFAULT_CONFIG_FILE)