naruse	2015-02-24 17:55:03 +0900 (Tue, 24 Feb 2015)

  New Revision: 49720

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

  Log:
    merge revision(s) 49531:
    
    test_dir_m17n.rb: fix tests
    
    * test/ruby/test_dir_m17n.rb (with_enc_path): test with UTF-8
      default external encoding for non-locale environments.
    
    * test/ruby/test_dir_m17n.rb (test_glob_warning_opendir): valid
      only if file permissions work.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/ruby/test_dir_m17n.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49719)
+++ ruby_2_2/version.h	(revision 49720)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-24"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_2/test/ruby/test_dir_m17n.rb
===================================================================
--- ruby_2_2/test/ruby/test_dir_m17n.rb	(revision 49719)
+++ ruby_2_2/test/ruby/test_dir_m17n.rb	(revision 49720)
@@ -307,11 +307,13 @@ class TestDir_M17N < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_dir_m17n.rb#L307
     with_tmpdir do |d|
       names = %W"\u{391 392 393 394 395} \u{3042 3044 3046 3048 304a}"
       names.each do |dir|
-        Dir.mkdir(dir) rescue next
-        begin
-          yield(dir)
-        ensure
-          File.chmod(0700, dir)
+        EnvUtil.with_default_external(Encoding::UTF_8) do
+          Dir.mkdir(dir) rescue next
+          begin
+            yield(dir)
+          ensure
+            File.chmod(0700, dir)
+          end
         end
       end
     end
@@ -321,6 +323,7 @@ class TestDir_M17N < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_dir_m17n.rb#L323
     with_enc_path do |dir|
       open("#{dir}/x", "w") {}
       File.chmod(0300, dir)
+      next if File.readable?(dir)
       assert_warning(/#{dir}/) do
         Dir.glob("#{dir}/*")
       end
@@ -331,6 +334,7 @@ class TestDir_M17N < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_dir_m17n.rb#L334
     with_enc_path do |dir|
       open("#{dir}/x", "w") {}
       File.chmod(0000, dir)
+      next if File.readable?(dir)
       assert_warning(/#{dir}/) do
         Dir.glob("#{dir}/x")
       end
@@ -341,6 +345,7 @@ class TestDir_M17N < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_dir_m17n.rb#L345
     with_enc_path do |dir|
       Dir.mkdir("#{dir}/x")
       File.chmod(0000, dir)
+      next if File.readable?(dir)
       assert_warning(/#{dir}/) do
         Dir.glob("#{dir}/x/")
       end

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49531


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