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

ruby-changes:31259

From: nobu <ko1@a...>
Date: Thu, 17 Oct 2013 19:51:44 +0900 (JST)
Subject: [ruby-changes:31259] nobu:r43338 (trunk): envutil.rb: use **opt

nobu	2013-10-17 19:51:37 +0900 (Thu, 17 Oct 2013)

  New Revision: 43338

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

  Log:
    envutil.rb: use **opt
    
    * test/ruby/envutil.rb: use **opt to call invoke_ruby.

  Modified files:
    trunk/test/ruby/envutil.rb
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 43337)
+++ test/ruby/envutil.rb	(revision 43338)
@@ -215,7 +215,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/test/ruby/envutil.rb#L215
         else
           child_env = []
         end
-        out, _, status = EnvUtil.invoke_ruby(child_env + %W'-W0', testsrc, true, :merge_to_stdout, opt)
+        out, _, status = EnvUtil.invoke_ruby(child_env + %W'-W0', testsrc, true, :merge_to_stdout, **opt)
         assert !status.signaled?, FailDesc[status, message, out]
       end
 
@@ -246,7 +246,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/test/ruby/envutil.rb#L246
       end
 
       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, **opt)
-        stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, opt)
+        stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
         if block_given?
           raise "test_stdout ignored, use block only or without block" if test_stdout != []
           raise "test_stderr ignored, use block only or without block" if test_stderr != []
@@ -271,7 +271,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/test/ruby/envutil.rb#L271
       end
 
       def assert_ruby_status(args, test_stdin="", message=nil, **opt)
-        out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, opt)
+        out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, **opt)
         assert(!status.signaled?, FailDesc[status, message, out])
         message ||= "ruby exit status is not success:"
         assert(status.success?, "#{message} (#{status.inspect})")
@@ -299,7 +299,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/test/ruby/envutil.rb#L299
 eom
         args = args.dup
         args.insert((Hash === args.first ? 1 : 0), *$:.map {|l| "-I#{l}"})
-        stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, opt)
+        stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, **opt)
         abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig))
         assert(!abort, FailDesc[status, stderr])
         self._assertions += stdout[/^assertions=(\d+)/, 1].to_i

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

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