diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 21:08:30 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 21:08:30 +0000 |
| commit | 87622a118b61c935ceafbbc7adc92590a707b3fd (patch) | |
| tree | 0802310d5fc0fd6361f8299331636fff1a3644a8 /test | |
| parent | d8a27d374a76c3ccde8bb7edfcb6e9a9bcd53411 (diff) | |
revert experimental changes related to Solaris CI
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_gc.rb | 5 | ||||
| -rw-r--r-- | test/ruby/test_process.rb | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index 1d410b0564..5af15b9580 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -346,10 +346,7 @@ class TestGc < Test::Unit::TestCase 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 diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index de219223f4..177af17724 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1364,8 +1364,7 @@ class TestProcess < Test::Unit::TestCase 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?]") |