Revision: 1937 http://trac.macosforge.org/projects/ruby/changeset/1937 Author: lsansonetti@apple.com Date: 2009-06-26 12:13:14 -0700 (Fri, 26 Jun 2009) Log Message: ----------- some work on MT-related specs Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt Modified: MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb 2009-06-26 19:10:59 UTC (rev 1936) +++ MacRuby/branches/experimental/spec/frozen/core/thread/critical_spec.rb 2009-06-26 19:13:14 UTC (rev 1937) @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require File.dirname(__FILE__) + '/fixtures/classes' -ruby_version_is ""..."1.9.1" do +ruby_version_is "" ... "1.9" do describe "Thread.critical=" do before(:each) do ScratchPad.clear Modified: MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb 2009-06-26 19:10:59 UTC (rev 1936) +++ MacRuby/branches/experimental/spec/frozen/core/thread/shared/exit.rb 2009-06-26 19:13:14 UTC (rev 1937) @@ -74,13 +74,15 @@ thread.join ScratchPad.recorded.should == nil end - - it "killing dying sleeping thread wakes up thread" do - t = ThreadSpecs.dying_thread_ensures { Thread.stop; ScratchPad.record :after_stop } - Thread.pass while t.status and t.status != "sleep" - t.send(@method) - t.join - ScratchPad.recorded.should == :after_stop + + ruby_version_is "" ... "1.9" do + it "killing dying sleeping thread wakes up thread" do + t = ThreadSpecs.dying_thread_ensures { Thread.stop; ScratchPad.record :after_stop } + Thread.pass while t.status and t.status != "sleep" + t.send(@method) + t.join + ScratchPad.recorded.should == :after_stop + end end it "killing dying running does nothing" do Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt 2009-06-26 19:10:59 UTC (rev 1936) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/sleep_tags.txt 2009-06-26 19:13:14 UTC (rev 1937) @@ -1,2 +1 @@ -critical:Kernel#sleep pauses execution indefinitely if not given a duration fails:Kernel#sleep is a private method