aboutsummaryrefslogtreecommitdiffstats
path: root/test/ruby
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-28 19:03:31 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-28 19:03:31 +0000
commit39715ad236eb503367dec26202544f03b3ebaa89 (patch)
tree0514f6aebaebcf051e1ccf6b0c35164959e457c0 /test/ruby
parent875b7d9e6638abdef05ca47dd471390dac6eafa6 (diff)
downloadruby-39715ad236eb503367dec26202544f03b3ebaa89.tar.gz
increase timeout (with full GC)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/test_gc.rb3
-rw-r--r--test/ruby/test_process.rb4
2 files changed, 4 insertions, 3 deletions
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index 4de23161d0..1d410b0564 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -346,8 +346,9 @@ class TestGc < Test::Unit::TestCase
ObjectSpace.define_finalizer(Object.new, f)
end
end;
- opts = {signal: :SEGV}
+ 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|
break result
end
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index e12b03801b..de219223f4 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1364,8 +1364,8 @@ class TestProcess < Test::Unit::TestCase
return unless Signal.list.include?("QUIT")
with_tmpchdir do
- GC.start
- s = assert_in_out_err([], "Process.kill(:SIGQUIT, $$);sleep 30", //, //, rlimit_core: 0)
+ GC.start(full_mark: true, immediate_sweep: true)
+ s = assert_in_out_err([], "Process.kill(:SIGQUIT, $$);sleep 30", //, //, rlimit_core: 0, timeout: 60)
assert_equal([false, true, false, nil],
[s.exited?, s.signaled?, s.stopped?, s.success?],
"[s.exited?, s.signaled?, s.stopped?, s.success?]")