Revert "Update to release MRI 2.2 tests."

This reverts commit 7b90ff4.

Author: headius

test/mri/-ext-/bug_reporter/test_bug_reporter.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'tmpdir'
+require_relative "../../ruby/envutil"
 
 class TestBugReporter < Test::Unit::TestCase
   def test_bug_reporter_add

test/mri/-ext-/exception/test_data_error.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative '../../ruby/envutil'
 
 module Bug
   class TestException < Test::Unit::TestCase

test/mri/-ext-/exception/test_ensured.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative '../../ruby/envutil'
 
 module Bug
   class Bug7802 < RuntimeError

test/mri/-ext-/iseq_load/test_iseq_load.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative '../../ruby/envutil'
 require '-test-/marshal/usr'
 
 module Bug end

test/mri/-ext-/marshal/test_usrmarshal.rb

@@ -33,67 +33,10 @@ def test_wchar_long
     len = str.size * n
     WCHARS.each do |enc|
       s = Bug::String.new(str.encode(enc))*n
-      assert_nothing_raised(ArgumentError, enc.name) {s.cstr_term}
+      assert_nothing_raised(ArgumentError) {s.cstr_term}
       s.set_len(s.bytesize / 2)
-      assert_equal(len / 2, s.size, enc.name)
-      assert_equal(0, s.cstr_term, enc.name)
-    end
-  end
-
-  def test_wchar_lstrip!
-    assert_wchars_term_char(" a") {|s| s.lstrip!}
-  end
-
-  def test_wchar_rstrip!
-    assert_wchars_term_char("a ") {|s| s.rstrip!}
-  end
-
-  def test_wchar_chop!
-    assert_wchars_term_char("a\n") {|s| s.chop!}
-  end
-
-  def test_wchar_chomp!
-    assert_wchars_term_char("a\n") {|s| s.chomp!}
-  end
-
-  def test_wchar_aset
-    assert_wchars_term_char("a"*30) {|s| s[29,1] = ""}
-  end
-
-  def test_wchar_sub!
-    assert_wchars_term_char("foobar") {|s| s.sub!(/#{"foo".encode(s.encoding)}/, "")}
-  end
-
-  def test_wchar_delete!
-    assert_wchars_term_char("foobar") {|s| s.delete!("ao".encode(s.encoding))}
-  end
-
-  def test_wchar_squeeze!
-    assert_wchars_term_char("foo!") {|s| s.squeeze!}
-  end
-
-  def test_wchar_tr!
-    assert_wchars_term_char("\u{3042}foobar") {|s|
-      enc = s.encoding
-      s.tr!("\u{3042}".encode(enc), "c".encode(enc))
-    }
-  end
-
-  def test_wchar_tr_s!
-    assert_wchars_term_char("\u{3042}foobar") {|s|
-      enc = s.encoding
-      s.tr_s!("\u{3042}".encode(enc), "c".encode(enc))
-    }
-  end
-
-  def assert_wchars_term_char(str)
-    result = {}
-    WCHARS.map do |enc|
-      s = Bug::String.new(str.encode(enc))
-      yield s
-      c = s.cstr_term_char
-      result[enc] = c if c
+      assert_equal(len / 2, s.size)
+      assert_equal(0, s.cstr_term)
     end
-    assert_empty(result)
   end
 end

test/mri/-ext-/proc/test_bmethod.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require "-test-/string/string"
+require_relative '../../ruby/envutil'
 
 class Test_StringModifyExpand < Test::Unit::TestCase
   def test_modify_expand_memory_leak

test/mri/-ext-/string/test_cstr.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require "-test-/struct"
+require_relative '../../ruby/envutil'
 
 class  Bug::Struct::Test_Member < Test::Unit::TestCase
   S = Bug::Struct.new(:a)