1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to use gem version of simplecov, not git clone

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2023-01-17 15:33:45 +09:00
parent ba45be3c43
commit 18d8333c30
Notes: git 2023-01-18 11:19:29 +00:00 
Merged: https://github.com/ruby/ruby/pull/7137
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common.mk
View File

@ -51,12 +51,6 @@ GEM_VENDOR =
BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver
BENCHMARK_DRIVER_GIT_REF = v0.16.3 BENCHMARK_DRIVER_GIT_REF = v0.16.3
SIMPLECOV_GIT_URL = https://github.com/simplecov-ruby/simplecov.git
SIMPLECOV_GIT_REF = v0.17.0
SIMPLECOV_HTML_GIT_URL = https://github.com/simplecov-ruby/simplecov-html.git
SIMPLECOV_HTML_GIT_REF = v0.10.2
DOCLIE_GIT_URL = https://github.com/ms-ati/docile.git
DOCLIE_GIT_REF = v1.3.2
STATIC_RUBY = static-ruby STATIC_RUBY = static-ruby
@ -1378,6 +1372,10 @@ update-config_files: PHONY
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \ $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
config.guess config.sub config.guess config.sub
update-coverage: PHONY
$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
--install-dir .bundle --conservative "simplecov"
refresh-gems: update-bundled_gems prepare-gems refresh-gems: update-bundled_gems prepare-gems
prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
extract-gems: $(HAVE_BASERUBY:yes=update-gems) extract-gems: $(HAVE_BASERUBY:yes=update-gems)

17
template/Makefile.in
View File

@ -602,23 +602,6 @@ update-benchmark-driver:
--branch $(BENCHMARK_DRIVER_GIT_REF) \ --branch $(BENCHMARK_DRIVER_GIT_REF) \
$(BENCHMARK_DRIVER_GIT_URL) benchmark-driver $(GIT_OPTS) $(BENCHMARK_DRIVER_GIT_URL) benchmark-driver $(GIT_OPTS)
update-doclie:
$(Q) $(tooldir)/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
--branch $(DOCLIE_GIT_REF) \
$(DOCLIE_GIT_URL) doclie $(GIT_OPTS)
update-simplecov-html:
$(Q) $(tooldir)/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
--branch $(SIMPLECOV_HTML_GIT_REF) \
$(SIMPLECOV_HTML_GIT_URL) simplecov-html $(GIT_OPTS)
update-simplecov:
$(Q) $(tooldir)/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \
--branch $(SIMPLECOV_GIT_REF) \
$(SIMPLECOV_GIT_URL) simplecov $(GIT_OPTS)
update-coverage: update-simplecov update-simplecov-html update-doclie
update-known-errors: update-known-errors:
errno --list | cut -d' ' -f1 | sort -u - $(srcdir)/defs/known_errors.def | \ errno --list | cut -d' ' -f1 | sort -u - $(srcdir)/defs/known_errors.def | \
$(IFCHANGE) $(srcdir)/defs/known_errors.def - $(IFCHANGE) $(srcdir)/defs/known_errors.def -

7
tool/test-coverage.rb
View File

@ -62,8 +62,11 @@ def save_coverage_data(res1)
end end
def invoke_simplecov_formatter def invoke_simplecov_formatter
%w[doclie simplecov-html simplecov].each do |f| # XXX docile-x.y.z and simplecov-x.y.z, simplecov-html-x.y.z, simplecov_json_formatter-x.y.z
$LOAD_PATH.unshift "#{__dir__}/../coverage/#{f}/lib" %w[simplecov simplecov-html simplecov_json_formatter docile].each do |f|
Dir.glob("#{__dir__}/../.bundle/gems/#{f}-*/lib").each do |d|
$LOAD_PATH.unshift d
end
end end
require "simplecov" require "simplecov"