archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 33030:

Browse source 
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-01-03 00:27:45 +00:00
parent 60f63dc385
commit d0ad683bb2
4 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> Mon Jan 2 19:08:54 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield(). * thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield().

25
test/coverage/test_coverage.rb
View file

@ -31,10 +31,31 @@ class TestCoverage < Test::Unit::TestCase
Coverage.start Coverage.start
require tmp + '/test.rb' require tmp + '/test.rb'
Coverage.result assert_equal 3, Coverage.result[tmp + '/test.rb'].size
Coverage.start Coverage.start
coverage_test_method 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 ensure

2
thread.c
View file

@ -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 line = rb_sourceline() - 1;
long count; long count;
if (RARRAY_PTR(coverage)[line] == Qnil) { if (RARRAY_PTR(coverage)[line] == Qnil) {
rb_bug("bug"); return;
} }
count = FIX2LONG(RARRAY_PTR(coverage)[line]) + 1; count = FIX2LONG(RARRAY_PTR(coverage)[line]) + 1;
if (POSFIXABLE(count)) { if (POSFIXABLE(count)) {

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #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_YEAR 2012
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 3 #define RUBY_RELEASE_DAY 2
#include "ruby/version.h" #include "ruby/version.h"