diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | test/coverage/test_coverage.rb | 25 | ||||
-rw-r--r-- | thread.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 35 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Mon Jan 2 19:27:18 2012 Yusuke Endoh <mame@tsg.ne.jp> + + * thread.c (update_coverage): skip coverage count up if the current + line is out of the way. rb_sourceline() is unreliable when source + code is big. [ruby-dev:44413] + + * test/coverage/test_coverage.rb: add a test for above. + Mon Jan 2 19:08:54 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield(). diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb index 56966b1f0e..4d785c3c0e 100644 --- a/test/coverage/test_coverage.rb +++ b/test/coverage/test_coverage.rb @@ -31,10 +31,31 @@ class TestCoverage < Test::Unit::TestCase Coverage.start require tmp + '/test.rb' - Coverage.result + assert_equal 3, Coverage.result[tmp + '/test.rb'].size Coverage.start coverage_test_method - assert_equal 1, Coverage.result.size + assert_equal 0, Coverage.result[tmp + '/test.rb'].size + } + } + ensure + $".replace loaded_features + end + + def test_big_code + loaded_features = $".dup + + Dir.mktmpdir {|tmp| + Dir.chdir(tmp) { + File.open("test.rb", "w") do |f| + f.puts "p\n" * 10000 + f.puts "def ignore(x); end" + f.puts "ignore([1" + f.puts "])" + end + + Coverage.start + require tmp + '/test.rb' + assert_equal 10003, Coverage.result[tmp + '/test.rb'].size } } ensure @@ -4804,7 +4804,7 @@ update_coverage(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas long line = rb_sourceline() - 1; long count; if (RARRAY_PTR(coverage)[line] == Qnil) { - rb_bug("bug"); + return; } count = FIX2LONG(RARRAY_PTR(coverage)[line]) + 1; if (POSFIXABLE(count)) { @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 8 +#define RUBY_PATCHLEVEL 9 -#define RUBY_RELEASE_DATE "2012-01-03" +#define RUBY_RELEASE_DATE "2012-01-02" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" |