merge revision(s) 39431:

	test_backtrace.rb: test Thread#backtrace_locations with range


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 18 insertions, 1 deletions

diff --git a/test/ruby/test_backtrace.rb b/test/ruby/test_backtrace.rb
index 2325c9306b..6ab9032855 100644
--- a/test/ruby/test_backtrace.rb
+++ b/test/ruby/test_backtrace.rb
@@ -141,4 +141,21 @@ class TestBacktrace < Test::Unit::TestCase
       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
diff --git a/version.h b/version.h
index 1c1725b5d8..bb56253075 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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