1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* test/runner.rb: use official repository for coverage tool.

* Makefile.in: ditto.
* common.mk: ditto.
* .gitignore: ignored third party repositories.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-11-09 08:38:20 +00:00
parent 0303a45d03
commit ece64610d3
5 changed files with 52 additions and 6 deletions

2
.gitignore vendored
View file

@ -64,6 +64,8 @@ y.tab.c
/config.status.lineno
/configure
/coverage/simplecov
/coverage/simplecov-html
/coverage/doclie
/coverage/.last_run.json
/coverage/.resultset.json*
/coverage/assets

View file

@ -1,3 +1,10 @@
Mon Nov 9 17:38:14 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* test/runner.rb: use official repository for coverage tool.
* Makefile.in: ditto.
* common.mk: ditto.
* .gitignore: ignored third party repositories.
Mon Nov 9 17:29:09 2015 Shugo Maeda <shugo@ruby-lang.org>
* compile.c (iseq_compile_each): Dynamic string literals should be

View file

@ -490,17 +490,44 @@ update-rubyspec: update-mspec
test-rubyspec-precheck:
@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
update-coverage:
update-doclie:
@$(CHDIR) $(srcdir); \
if [ -d coverage/doclie ]; then \
cd coverage/doclie; \
echo updating doclie ...; \
exec git fetch; \
exec git checkout $(DOCLIE_GIT_REF); \
else \
echo retrieving doclie ...; \
exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \
fi
update-simplecov-html:
@$(CHDIR) $(srcdir); \
if [ -d coverage/simplecov-html ]; then \
cd coverage/simplecov-html; \
echo updating simplecov-html ...; \
exec git fetch; \
exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
else \
echo retrieving simplecov-html ...; \
exec git clone --branch $(SIMPLECOV_HTML_GIT_REF) $(SIMPLECOV_HTML_GIT_URL) coverage/simplecov-html; \
fi
update-simplecov:
@$(CHDIR) $(srcdir); \
if [ -d coverage/simplecov ]; then \
cd coverage/simplecov; \
echo updating simplecov ...; \
exec git pull; \
exec git fetch; \
exec git checkout $(SIMPLECOV_GIT_REF); \
else \
echo retrieving simplecov ...; \
exec git clone $(SIMPLECOV_GIT_URL) coverage/simplecov; \
exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \
fi
update-coverage: update-simplecov update-simplecov-html update-doclie
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
vmtc.inc vm.inc

View file

@ -25,7 +25,12 @@ SPEC_GIT_BASE = git://github.com/ruby
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
SIMPLECOV_GIT_URL = git://github.com/ruby/simplecov.git
SIMPLECOV_GIT_URL = git://github.com/colszowka/simplecov.git
SIMPLECOV_GIT_REF = v0.10.0
SIMPLECOV_HTML_GIT_URL = git://github.com/colszowka/simplecov-html.git
SIMPLECOV_HTML_GIT_REF = v0.10.0
DOCLIE_GIT_URL = git://github.com/ms-ati/docile.git
DOCLIE_GIT_REF = v1.1.5
STATIC_RUBY = static-ruby

View file

@ -24,9 +24,14 @@ require_relative 'lib/tracepointchecker'
require_relative 'lib/zombie_hunter'
if ENV['COVERAGE']
$LOAD_PATH.unshift "#{src_testdir}/../coverage/simplecov/lib"
%w[doclie simplecov-html simplecov].each do |f|
$LOAD_PATH.unshift "#{src_testdir}/../coverage/#{f}/lib"
end
require 'simplecov'
SimpleCov.start
SimpleCov.start do
add_filter "/test/"
end
end
begin