Merge pull request jruby#175 from ryenus/x-j-js

headius · headius · commit 4a6bb0a2c641 · 2012-08-07T00:24:18.000-07:00
align file name with content encoding
diff --git a/test/JRUBY_6606/dir-j.rb b/test/JRUBY_6606/dir-j.rb
@@ -1,6 +1,6 @@
-# encoding: Shift_JIS
+# encoding: EUC-JP
 
 Dir.chdir(File.dirname __FILE__) do
-  Dir.entries('res/����').each{|n| p n unless n == '.' || n == '..'}
-  Dir.foreach('res/����') {|n| p n unless n == '.' || n == '..'}
+  Dir.entries('res/����').each{|n| p n unless n == '.' || n == '..'}
+  Dir.foreach('res/����') {|n| p n unless n == '.' || n == '..'}
 end
diff --git a/test/JRUBY_6606/dir-js.rb b/test/JRUBY_6606/dir-js.rb
@@ -1,6 +1,6 @@
-# encoding: EUC-JP
+# encoding: Shift_JIS
 
 Dir.chdir(File.dirname __FILE__) do
-  Dir.entries('res/����').each{|n| p n unless n == '.' || n == '..'}
-  Dir.foreach('res/����') {|n| p n unless n == '.' || n == '..'}
+  Dir.entries('res/����').each{|n| p n unless n == '.' || n == '..'}
+  Dir.foreach('res/����') {|n| p n unless n == '.' || n == '..'}
 end

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 -# encoding: Shift_JIS
 +# encoding: EUC-JP
 Dir.chdir(File.dirname __FILE__) do
 -  Dir.entries('res/‚ ‚¢').each{|n| p n unless n == '.' || n == '..'}
 -  Dir.foreach('res/‚ ‚¢') {|n| p n unless n == '.' || n == '..'}
 +  Dir.entries('res/¤¢¤¤').each{|n| p n unless n == '.' || n == '..'}
 +  Dir.foreach('res/¤¢¤¤') {|n| p n unless n == '.' || n == '..'}
 end