diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 11:25:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 11:25:24 +0000 |
| commit | bcfdcc809cbeea8f593237114cf5ccd688f7d577 (patch) | |
| tree | a38bdff345c8932cf8ddac319f68905b6ad61043 | |
| parent | 7971aa6cdab3ac6dbb85533d43bde83c0880febc (diff) | |
| download | ruby-bcfdcc809cbeea8f593237114cf5ccd688f7d577.tar.gz ruby-bcfdcc809cbeea8f593237114cf5ccd688f7d577.tar.xz ruby-bcfdcc809cbeea8f593237114cf5ccd688f7d577.zip | |
* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: restore $:
after require.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/drb/drbtest.rb | 9 | ||||
| -rw-r--r-- | test/soap/calc/test_calc_cgi.rb | 9 |
3 files changed, 19 insertions, 6 deletions
@@ -1,4 +1,4 @@ -Thu Apr 8 19:45:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Apr 8 20:25:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/extmk.rb (extmake): skip uncompiled extensions. @@ -13,11 +13,14 @@ Thu Apr 8 19:45:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/runner.rb: do nothing while cross-compiling. * test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to - know ruby binary. + know ruby binary, and restore $: after require. * test/ruby/envutil.rb: give priority to RUBY environment variable to use just compiled binary and libraries. + * test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: restore $: + after require. + Thu Apr 8 19:03:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_binmode): inverted condition. [ruby-dev:23349] diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index dad26759c..e90b2ad56 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 6b2632946..4dbf96468 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 |