[前][次][番号順一覧][スレッド一覧]

ruby-changes:8417

From: nobu <ko1@a...>
Date: Sun, 26 Oct 2008 18:42:36 +0900 (JST)
Subject: [ruby-changes:8417] Ruby:r19948 (trunk): * test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems

nobu	2008-10-26 18:42:21 +0900 (Sun, 26 Oct 2008)

  New Revision: 19948

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19948

  Log:
    * test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems
      to get rid of the interference.
    * test/ruby/test_io.rb (ruby): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/envutil.rb
    trunk/test/ruby/test_io.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19947)
+++ ChangeLog	(revision 19948)
@@ -1,4 +1,4 @@
-Sun Oct 26 18:11:23 2008  Nobuyoshi Nakada  <nobu@r...>
+Sun Oct 26 18:42:18 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (blocking_region_{begin,end}): declared as inline.
 
@@ -11,6 +11,11 @@
 	* 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@r...>
 
 	* io.c (read_all): use the given buffer to read when needs readconv.
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 19947)
+++ test/ruby/test_io.rb	(revision 19948)
@@ -581,7 +581,7 @@
   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?
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 19947)
+++ test/ruby/envutil.rb	(revision 19948)
@@ -122,7 +122,7 @@
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]