Revision: 1250 http://trac.macosforge.org/projects/ruby/changeset/1250 Author: lsansonetti@apple.com Date: 2009-03-28 21:38:07 -0700 (Sat, 28 Mar 2009) Log Message: ----------- marked some specs as not running on 1.9 Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb 2009-03-29 04:30:47 UTC (rev 1249) +++ MacRuby/branches/experimental/spec/frozen/language/regexp_spec.rb 2009-03-29 04:38:07 UTC (rev 1250) @@ -642,29 +642,31 @@ 2.times { /#{o}/o } ScratchPad.recorded.should == [:to_s_callback] end + + ruby_version_is "" ... "1.9" do + it 'does not do thread synchronization for /o' do + ScratchPad.record [] + + to_s_callback2 = Proc.new do + ScratchPad << :to_s_callback2 + "class_with_to_s2" + end - it 'does not do thread synchronization for /o' do - ScratchPad.record [] - - to_s_callback2 = Proc.new do - ScratchPad << :to_s_callback2 - "class_with_to_s2" - end - - to_s_callback1 = Proc.new do - ScratchPad << :to_s_callback1 - t2 = Thread.new do - o2 = LanguageSpecs::ClassWith_to_s.new(to_s_callback2) - ScratchPad << LanguageSpecs.get_regexp_with_substitution(o2) + to_s_callback1 = Proc.new do + ScratchPad << :to_s_callback1 + t2 = Thread.new do + o2 = LanguageSpecs::ClassWith_to_s.new(to_s_callback2) + ScratchPad << LanguageSpecs.get_regexp_with_substitution(o2) + end + t2.join + "class_with_to_s1" end - t2.join - "class_with_to_s1" + + o1 = LanguageSpecs::ClassWith_to_s.new(to_s_callback1) + ScratchPad << LanguageSpecs.get_regexp_with_substitution(o1) + + ScratchPad.recorded.should == [:to_s_callback1, :to_s_callback2, /class_with_to_s2/, /class_with_to_s2/] end - - o1 = LanguageSpecs::ClassWith_to_s.new(to_s_callback1) - ScratchPad << LanguageSpecs.get_regexp_with_substitution(o1) - - ScratchPad.recorded.should == [:to_s_callback1, :to_s_callback2, /class_with_to_s2/, /class_with_to_s2/] end it 'supports modifier combinations' do @@ -678,7 +680,10 @@ # Encodings ############################################################################# - not_compliant_on :ruby19 do + # These specs won't run on MacRuby too, and this #not_compliant_on method doesn't + # seem to work. Eloy? + #not_compliant_on :ruby19 do + ruby_version_is "" ... "1.9" do it 'supports /e (EUC encoding)' do /./e.match("\303\251").to_a.should == ["\303\251"] end