diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-08 07:21:57 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-08 07:21:57 +0000 |
commit | 04ce12909c02abdcb2eb7abdd994575850973e7e (patch) | |
tree | 0166af7b006630f43cc299e11d70762b5b3d04e7 | |
parent | f2e09c4606b02de328c2a6ff233e8fbf2bc6d9b8 (diff) |
merge revision(s) 36516
* test/ruby/test_dir_m17n.rb: remove a garbage.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | test/ruby/test_dir_m17n.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu Nov 8 16:17:54 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/ruby/test_dir_m17n.rb: remove a garbage. + Thu Nov 8 15:22:09 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_dir_m17n.rb: sorry, typo. diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index fea7566249..e37a2de31d 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -199,7 +199,6 @@ class TestDir_M17N < Test::Unit::TestCase win_expected_filename = filename.encode(Encoding.find("filesystem"), "euc-jp") rescue "?" opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM ents = Dir.entries(".", opts) - p ents result = ents.include?(filename) || (/darwin/ =~ RUBY_PLATFORM && ents.include?("%A4%A2".force_encoding("ASCII-8BIT"))) || (/mswin|mingw/ =~ RUBY_PLATFORM && ents.include?(win_expected_filename.force_encoding("ASCII-8BIT"))) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 314 +#define RUBY_PATCHLEVEL 315 #define RUBY_RELEASE_DATE "2012-11-08" #define RUBY_RELEASE_YEAR 2012 |