1 files changed, 10 insertions, 19 deletions
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index 9c9fd9470b..f594971e25 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -1,12 +1,5 @@
 require 'test/unit'
-dir = File.dirname(File.expand_path(__FILE__))
-orgpath = $:.dup
-begin
-  $:.push(dir)
-  require 'marshaltestlib'
-ensure
-  $:.replace(orgpath)
-end
+require 'marshaltestlib'
 
 class TestMarshal < Test::Unit::TestCase
   include MarshalTestLib
@@ -29,20 +22,18 @@ class TestMarshal < Test::Unit::TestCase
     return f
   end
 
-  StrClone=String.clone;
-
   def test_marshal
-    $x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)]
-    $y = Marshal.dump($x)
-    assert_equal($x, Marshal.load($y))
-
-    assert_instance_of(StrClone, Marshal.load(Marshal.dump(StrClone.new("abc"))))
+    x = [1, 2, 3, [4,5,"foo"], {1=>"bar"}, 2.5, fact(30)]
+    assert_equal x, Marshal.load(Marshal.dump(x))
 
     [[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z|
-      a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
-      ma = Marshal.dump(a)
-      b = Marshal.load(ma)
-      assert_equal(a, b)
+      obj = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
+      assert_equal obj, Marshal.load(Marshal.dump(obj))
     }
   end
+
+  StrClone = String.clone
+  def test_marshal_cloned_class
+    assert_instance_of(StrClone, Marshal.load(Marshal.dump(StrClone.new("abc"))))
+  end
 end