hsbt	2015-11-09 17:38:20 +0900 (Mon, 09 Nov 2015)

  New Revision: 52502

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52502

  Log:
    * test/runner.rb: use official repository for coverage tool.
    * Makefile.in: ditto.
    * common.mk: ditto.
    * .gitignore: ignored third party repositories.

  Modified files:
    trunk/.gitignore
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/test/runner.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52501)
+++ ChangeLog	(revision 52502)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Nov  9 17:38:14 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* 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@r...>
 
 	* compile.c (iseq_compile_each): Dynamic string literals should be
Index: common.mk
===================================================================
--- common.mk	(revision 52501)
+++ common.mk	(revision 52502)
@@ -25,7 +25,12 @@ SPEC_GIT_BASE = git://github.com/ruby https://github.com/ruby/ruby/blob/trunk/common.mk#L25
 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
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 52501)
+++ Makefile.in	(revision 52502)
@@ -490,17 +490,44 @@ update-rubyspec: update-mspec https://github.com/ruby/ruby/blob/trunk/Makefile.in#L490
 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
 
Index: test/runner.rb
===================================================================
--- test/runner.rb	(revision 52501)
+++ test/runner.rb	(revision 52502)
@@ -24,9 +24,14 @@ require_relative 'lib/tracepointchecker' https://github.com/ruby/ruby/blob/trunk/test/runner.rb#L24
 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
Index: .gitignore
===================================================================
--- .gitignore	(revision 52501)
+++ .gitignore	(revision 52502)
@@ -64,6 +64,8 @@ y.tab.c https://github.com/ruby/ruby/blob/trunk/.gitignore#L64
 /config.status.lineno
 /configure
 /coverage/simplecov
+/coverage/simplecov-html
+/coverage/doclie
 /coverage/.last_run.json
 /coverage/.resultset.json*
 /coverage/assets

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/