diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-26 09:42:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-26 09:42:21 +0000 |
| commit | b98a6b7ac06219d3e4a0a46087f1a8c2a11438bb (patch) | |
| tree | d7b846ec49feeaccc7022ac6dd5ab32bdd66e84a | |
| parent | bcf61f58d518308658de1c208703bfdd7f79d1c7 (diff) | |
* test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems
to get rid of the interference.
* test/ruby/test_io.rb (ruby): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,4 @@ -Sun Oct 26 18:11:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Oct 26 18:42:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread.c (blocking_region_{begin,end}): declared as inline. @@ -11,6 +11,11 @@ Sun Oct 26 18:11:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/io/wait/{extconf.rb,wait.c}: needs sys/ioctl.h for fcntl on cygwin. + * test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems + to get rid of the interference. + + * test/ruby/test_io.rb (ruby): ditto. + Sun Oct 26 13:30:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (read_all): use the given buffer to read when needs readconv. diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 4aba8a0bde..22901ea99b 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -122,7 +122,7 @@ module Test c = "C" env = {} LANG_ENVS.each {|lc| env[lc], ENV[lc] = ENV[lc], c} - pid = spawn(EnvUtil.rubybin, *args, STDIN=>in_c, STDOUT=>out_c, STDERR=>err_c) + pid = spawn(EnvUtil.rubybin, "--disable-gems", *args, STDIN=>in_c, STDOUT=>out_c, STDERR=>err_c) in_c.close out_c.close err_c.close diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 4d9bb51fe3..2b6810e055 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -581,7 +581,7 @@ class TestIO < Test::Unit::TestCase def ruby(*args) args = ['-e', '$>.write($<.read)'] if args.empty? ruby = EnvUtil.rubybin - f = IO.popen([ruby] + args, 'r+') + f = IO.popen([ruby, "--disable-gems"] + args, 'r+') yield(f) ensure f.close unless !f || f.closed? |