ruby-changes:40282
From: naruse <ko1@a...>
Date: Fri, 30 Oct 2015 06:08:50 +0900 (JST)
Subject: [ruby-changes:40282] naruse:r52363 (trunk): revert experimental changes related to Solaris CI
naruse 2015-10-30 06:08:30 +0900 (Fri, 30 Oct 2015) New Revision: 52363 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52363 Log: revert experimental changes related to Solaris CI Modified files: trunk/test/ruby/test_gc.rb trunk/test/ruby/test_process.rb Index: test/ruby/test_gc.rb =================================================================== --- test/ruby/test_gc.rb (revision 52362) +++ test/ruby/test_gc.rb (revision 52363) @@ -346,10 +346,7 @@ class TestGc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_gc.rb#L346 ObjectSpace.define_finalizer(Object.new, f) end end; - opts = {signal: :SEGV, timeout: 60} - opts[:rlimit_core] = 0 if defined?(Process::RLIMIT_CORE) - GC.start(full_mark: true, immediate_sweep: true) - out, err, status = assert_in_out_err(["-e", src], "", [], [], bug10595, opts) do |*result| + out, err, status = assert_in_out_err(["-e", src], "", [], [], bug10595, signal: :SEGV) do |*result| break result end unless /mswin|mingw/ =~ RUBY_PLATFORM Index: test/ruby/test_process.rb =================================================================== --- test/ruby/test_process.rb (revision 52362) +++ test/ruby/test_process.rb (revision 52363) @@ -1364,8 +1364,7 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_process.rb#L1364 return unless Signal.list.include?("QUIT") with_tmpchdir do - GC.start(full_mark: true, immediate_sweep: true) - s = assert_in_out_err([], "Process.kill(:SIGQUIT, $$);sleep 30", //, //, rlimit_core: 0, timeout: 60) + s = assert_in_out_err([], "Process.kill(:SIGQUIT, $$);sleep 30", //, //, rlimit_core: 0) assert_equal([false, true, false, nil], [s.exited?, s.signaled?, s.stopped?, s.success?], "[s.exited?, s.signaled?, s.stopped?, s.success?]") -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/