1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems

Browse Source 
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
This commit is contained in:
nobu 2008-10-26 09:42:21 +00:00
parent bcf61f58d5
commit b98a6b7ac0
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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. * 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 * ext/io/wait/{extconf.rb,wait.c}: needs sys/ioctl.h for fcntl on
cygwin. 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> 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. * io.c (read_all): use the given buffer to read when needs readconv.

2
test/ruby/envutil.rb
View File

@ -122,7 +122,7 @@ module Test
c = "C" c = "C"
env = {} env = {}
LANG_ENVS.each {|lc| env[lc], ENV[lc] = ENV[lc], c} 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 in_c.close
out_c.close out_c.close
err_c.close err_c.close

2
test/ruby/test_io.rb
View File

@ -581,7 +581,7 @@ class TestIO < Test::Unit::TestCase
def ruby(*args) def ruby(*args)
args = ['-e', '$>.write($<.read)'] if args.empty? args = ['-e', '$>.write($<.read)'] if args.empty?
ruby = EnvUtil.rubybin ruby = EnvUtil.rubybin
f = IO.popen([ruby] + args, 'r+') f = IO.popen([ruby, "--disable-gems"] + args, 'r+')
yield(f) yield(f)
ensure ensure
f.close unless !f || f.closed? f.close unless !f || f.closed?