naruse	2016-04-15 15:39:49 +0900 (Fri, 15 Apr 2016)

  New Revision: 54594

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

  Log:
    * common.mk (benchmark): order options for built-ruby and compare-ruby.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54593)
+++ ChangeLog	(revision 54594)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Apr 15 15:38:58 2016  NARUSE, Yui  <naruse@r...>
+
+	* common.mk (benchmark): order options for built-ruby and compare-ruby.
+
 Fri Apr 15 14:14:00 2016  Kenta Murata  <mrkn@m...>
 
 	* test/ruby/test_array.rb (test_sum): add assertions for Rational and
Index: common.mk
===================================================================
--- common.mk	(revision 54593)
+++ common.mk	(revision 54594)
@@ -927,19 +927,19 @@ OPTS = https://github.com/ruby/ruby/blob/trunk/common.mk#L927
 # for example,
 #  $ make benchmark COMPARE_RUBY="ruby-trunk" OPTS="-e ruby-2.2.2"
 # This command compares trunk and built-ruby and 2.2.2
-benchmark: $(PROGRAM) PHONY
+benchmark: miniruby$(EXEEXT) PHONY
 	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+	            --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
 	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
 
-benchmark-each: $(PROGRAM) PHONY
+benchmark-each: miniruby$(EXEEXT) PHONY
 	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+	            --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
 	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
 
-tbench: $(PROGRAM) PHONY
+tbench: miniruby$(EXEEXT) PHONY
 	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+	            --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
 	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
 
 run.gdb:

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