nagachika	2013-03-09 23:02:53 +0900 (Sat, 09 Mar 2013)

  New Revision: 39669

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39669

  Log:
    merge revision(s) 39431:
    
    test_backtrace.rb: test Thread#backtrace_locations with range

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_backtrace.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39668)
+++ ruby_2_0_0/version.h	(revision 39669)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 38
+#define RUBY_PATCHLEVEL 39
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/ruby/test_backtrace.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_backtrace.rb	(revision 39668)
+++ ruby_2_0_0/test/ruby/test_backtrace.rb	(revision 39669)
@@ -141,4 +141,21 @@ class TestBacktrace < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_backtrace.rb#L141
       q << true
     end
   end
+
+  def test_thread_backtrace_locations_with_range
+    begin
+      q = Queue.new
+      th = Thread.new{
+        th_rec q
+      }
+      sleep 0.5
+      bt = th.backtrace(0,2)
+      locs = th.backtrace_locations(0..1).map { |loc|
+        loc.to_s
+      }
+      assert_equal(bt, locs)
+    ensure
+      q << true
+    end
+  end
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39431


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/