Merge branch 'enable_encoding_tests' of https://github.com/ahorek/jruby

Author: ahorek

test/mri.core.index

@@ -114,6 +114,29 @@ ruby/test_vm_dump.rb
 ruby/test_weakmap.rb
 ruby/test_whileuntil.rb
 
+ruby/enc/test_big5.rb
+ruby/enc/test_cp949.rb
+ruby/enc/test_euc_tw.rb
+ruby/enc/test_koi8.rb
+ruby/enc/test_windows_1251.rb
+ruby/enc/test_case_comprehensive.rb
+ruby/enc/test_emoji.rb
+ruby/enc/test_gb18030.rb
+ruby/enc/test_regex_casefold.rb
+ruby/enc/test_windows_1252.rb
+ruby/enc/test_case_mapping.rb
+ruby/enc/test_emoji_breaks.rb
+ruby/enc/test_gbk.rb
+ruby/enc/test_shift_jis.rb
+ruby/enc/test_case_options.rb
+ruby/enc/test_euc_jp.rb
+ruby/enc/test_grapheme_breaks.rb
+ruby/enc/test_utf16.rb
+ruby/enc/test_cesu8.rb
+ruby/enc/test_euc_kr.rb
+ruby/enc/test_iso_8859.rb
+ruby/enc/test_utf32.rb
+
 # Tests below are disabled for various reasons
 
 # accesses RubyVM during load

test/mri/excludes/TestCaseMapping.rb

@@ -0,0 +1,2 @@
+exclude :test_shift_jis_downcase_ascii, "needs investigation"
+exclude :test_shift_jis_upcase_ascii, "needs investigation"