From c40e6f82579f54d0fb437876d875de87a2d16241 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 30 Apr 2012 14:09:36 +0000 Subject: * test/ruby/test_continuation.rb (tracing_with_set_trace_func): don't call Continuation from other threads. [ruby-dev:45596] [Bug #6382] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_continuation.rb | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35bcc5fb78..cc2f3b0f01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 30 23:05:53 2012 CHIKANAGA Tomoyuki + + * test/ruby/test_continuation.rb (tracing_with_set_trace_func): don't + call Continuation from other threads. [ruby-dev:45596] [Bug #6382] + Mon Apr 30 21:09:06 2012 Nobuyoshi Nakada * configure.in (optflags): disable unsafe optimizations. diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb index 64390d8177..5e5b78cc82 100644 --- a/test/ruby/test_continuation.rb +++ b/test/ruby/test_continuation.rb @@ -78,10 +78,13 @@ class TestContinuation < Test::Unit::TestCase end def tracing_with_set_trace_func + orig_thread = Thread.current cont = nil func = lambda do |*args| - @memo += 1 - cont.call(nil) + if orig_thread == Thread.current + @memo += 1 + cont.call(nil) + end end cont = callcc { |cc| cc } if cont -- cgit v1.2.3