merge revision(s) 39359:

	Add test for [Backport #7896] [ruby-core:52607]

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

3 files changed, 15 insertions, 3 deletions

diff --git a/ext/-test-/iter/break.c b/ext/-test-/iter/break.c
index b72440f838..56ba7e7ffd 100644
--- a/ext/-test-/iter/break.c
+++ b/ext/-test-/iter/break.c
@@ -1,6 +1,14 @@
 #include <ruby.h>
 
 static VALUE
+iter_break(VALUE self)
+{
+    rb_iter_break();
+
+    UNREACHABLE;
+}
+
+static VALUE
 iter_break_value(VALUE self, VALUE val)
 {
     rb_iter_break_value(val);
@@ -12,5 +20,6 @@ void
 Init_break(void)
 {
     VALUE breakable = rb_define_module_under(rb_define_module("Bug"), "Breakable");
-    rb_define_module_function(breakable, "iter_break", iter_break_value, 1);
+    rb_define_module_function(breakable, "iter_break", iter_break, 0);
+    rb_define_module_function(breakable, "iter_break_value", iter_break_value, 1);
 }
diff --git a/test/-ext-/iter/test_iter_break.rb b/test/-ext-/iter/test_iter_break.rb
index 03797a897d..1ef2aad3c2 100644
--- a/test/-ext-/iter/test_iter_break.rb
+++ b/test/-ext-/iter/test_iter_break.rb
@@ -3,7 +3,10 @@ require '-test-/iter/break'
 
 class TestIterBreak < Test::Unit::TestCase
   def test_iter_break
+    backport7896 = '[ruby-core:52607]'
+    assert_equal(nil, 1.times{Bug::Breakable.iter_break}, backport7896)
+
     feature5895 = '[ruby-dev:45132]'
-    assert_equal(42, 1.times{Bug::Breakable.iter_break(42)}, feature5895)
+    assert_equal(42, 1.times{Bug::Breakable.iter_break_value(42)}, feature5895)
   end
 end
diff --git a/version.h b/version.h
index 992868e55a..213f1fe4ee 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 24
+#define RUBY_PATCHLEVEL 25
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3