summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-08 11:25:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-08 11:25:24 +0000
commiteb1fa257b5f08aafe440a84a064bf9d93652dabe (patch)
treea38bdff345c8932cf8ddac319f68905b6ad61043 /test
parentfa7a5d5477dd8015b9bc0be9dc7ef2bf583e46d8 (diff)
* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: restore $:
after require. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/drb/drbtest.rb9
-rw-r--r--test/soap/calc/test_calc_cgi.rb9
2 files changed, 14 insertions, 4 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index dad26759c0..e90b2ad566 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -2,8 +2,13 @@ require 'test/unit'
require 'drb/drb'
require 'drb/extservm'
require 'timeout'
-$:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-require 'envutil'
+begin
+ loadpath = $:.dup
+ $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+ require 'envutil'
+ensure
+ $:.replace(loadpath)
+end
class DRbService
@@manager = DRb::ExtServManager.new
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index 6b26329460..4dbf96468b 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -2,8 +2,13 @@ require 'test/unit'
require 'soap/rpc/driver'
require 'logger'
require 'webrick'
-$:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-require 'envutil'
+begin
+ loadpath = $:.dup
+ $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+ require 'envutil'
+ensure
+ $:.replace(loadpath)
+end
module SOAP