From f56c6318de7332e1a6c930f2ddc8ed93ab55d96a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 22 Feb 2012 14:27:11 +0000
Subject: [PATCH] * test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug
 #6061]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 | 4 ++++
 test/iconv/test_option.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fb70f0448e..cc90dd11c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 22 23:27:08 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]
+
 Wed Feb 22 21:45:56 2012  Tanaka Akira  <akr@fsij.org>
 
 	* ext/curses/curses.c: use defined() to suppress a warning.
diff --git a/test/iconv/test_option.rb b/test/iconv/test_option.rb
index b210fa498a..e81df9d850 100644
--- a/test/iconv/test_option.rb
+++ b/test/iconv/test_option.rb
@@ -40,4 +40,4 @@ class TestIconv::Option < TestIconv
     assert_equal(SJIS_STR, str)
     iconv.close
   end
-end if false and defined?(TestIconv)
+end if defined?(TestIconv)