2 files changed, 13 insertions, 123 deletions
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
index 9629cea636..e69de29bb2 100644
--- a/bootstraptest/pending.rb
+++ b/bootstraptest/pending.rb
@@ -1,25 +0,0 @@
-assert_equal 'ok', %q{
-  1.times{
-    eval("break")
-  }
-  :ok
-}, '[ruby-dev:32525]'
-
-assert_equal "ok", %q{
-  module Foo
-  end
-
-  begin
-    def foo(&b)
-      Foo.module_eval &b
-    end
-    foo{
-      def bar
-      end
-    }
-    bar
-  rescue NoMethodError
-    :ok
-  end
-}, '[ruby-core:14378]'
-
diff --git a/bootstraptest/test_class.rb b/bootstraptest/test_class.rb
index 93bb51d234..1c49b83037 100644
--- a/bootstraptest/test_class.rb
+++ b/bootstraptest/test_class.rb
@@ -112,106 +112,21 @@ assert_equal 'String',  %q( class A; ::C = "OK"; end;  C.class )
 assert_equal 'Class',   %q( class C; end;  C.dup.class )
 assert_equal 'Module',  %q( module M; end;  M.dup.class )
 
-__END__
 
-  def test_singletonclass
-    ae %q{
-      obj = ''
-      class << obj
-        def m
-          :OK
-        end
-      end
-      obj.m
-    }
-    ae %q{
-      obj = ''
-      Const = :NG
-      class << obj
-        Const = :OK
-        def m
-          Const
-        end
-      end
-      obj.m
-    }
-    ae %q{
-      obj = ''
-      class C
-        def m
-          :NG
-        end
-      end
-      class << obj
-        class C
-          def m
-            :OK
-          end
-        end
-        def m
-          C.new.m
-        end
-      end
-      obj.m
-    }
-    ae %q{ # [yarv-dev:818]
-      class A
-      end
-      class << A
-        C = "OK"
-        def m
-          class << Object
-            $a = C
-          end
-        end
-      end
-      A.m
-      $a
-    }
+assert_equal "ok", %q{
+  module Foo
   end
 
-  def test_initialize
-      class C
-        def initialize
-          @a = :C
-        end
-        def a
-          @a
-        end
+  begin
+    def foo(&b)
+      Foo.module_eval &b
+    end
+    foo{
+      def bar
       end
-      C.new.a
-  end
-
-  def test_attr
-      class C
-        def set
-          @a = 1
-        end
-        def get
-          @a
-        end
-      end
-      c = C.new
-      c.set
-      c.get
-  end
-
-  def test_attr_accessor
-      class C
-        attr_accessor :a
-        attr_reader   :b
-        attr_writer   :c
-        def b_write
-          @b = 'huga'
-        end
-        def m a
-          'test_attr_accessor' + @b + @c
-        end
-      end
-
-      c = C.new
-      c.a = true
-      c.c = 'hoge'
-      c.b_write
-      c.m(c.b)
+    }
+    bar()
+  rescue NameError
+    :ok
   end
+}, '[ruby-core:14378]'