* test/soap/marshal/test_marshal.rb, test/ruby/test_marshal.rb: do $:

          trick to share the testcase test/ruby/marshaltestlib.rb.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 21 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a4645a8a5..d2341966d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* test/soap/marshal/test_marshal.rb, test/ruby/test_marshal.rb: do $:
+	  trick to share the testcase test/ruby/marshaltestlib.rb.
+
 Tue Feb 17 23:13:23 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/ruby/marshaltestlib.rb: common marshal testcase added.
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index 3bd2cc08f..2008e3f36 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -1,5 +1,12 @@
 require 'test/unit'
-require File.join(File.dirname(File.expand_path(__FILE__)), 'marshaltestlib')
+dir = File.dirname(File.expand_path(__FILE__))
+orgpath = $:.dup
+begin
+  $:.push(dir)
+  require 'marshaltestlib'
+ensure
+  $:.replace(orgpath)
+end
 
 $KCODE = 'none'
 
diff --git a/test/soap/marshal/test_marshal.rb b/test/soap/marshal/test_marshal.rb
index 846619523..5cc30a2b5 100644
--- a/test/soap/marshal/test_marshal.rb
+++ b/test/soap/marshal/test_marshal.rb
@@ -1,7 +1,13 @@
 require 'test/unit'
 require 'soap/marshal'
-require File.join(File.dirname(File.expand_path(__FILE__)), '../../ruby/marshaltestlib')
-
+dir = File.join(File.dirname(File.expand_path(__FILE__)), '../../ruby')
+orgpath = $:.dup
+begin
+  $:.push(dir)
+  require 'marshaltestlib'
+ensure
+  $:.replace(orgpath)
+end
 
 module SOAP
 module Marshal