Skip to content

Commit

Permalink
* test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
nobu committed Oct 26, 2008
1 parent bcf61f5 commit b98a6b7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion ChangeLog
@@ -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.

Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/ruby/envutil.rb
Expand Up @@ -122,7 +122,7 @@ def assert_in_out_err(args, test_stdin = "", test_stdout = "", test_stderr = "",
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
Expand Down
2 changes: 1 addition & 1 deletion test/ruby/test_io.rb
Expand Up @@ -581,7 +581,7 @@ def pipe(wp, rp)
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?
Expand Down

0 comments on commit b98a6b7

Please sign in to comment.