aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--common.mk12
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b2ed88a6fc..c295e4b3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 15 15:38:58 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * common.mk (benchmark): order options for built-ruby and compare-ruby.
+
Fri Apr 15 14:14:00 2016 Kenta Murata <mrkn@mrkn.jp>
* test/ruby/test_array.rb (test_sum): add assertions for Rational and
diff --git a/common.mk b/common.mk
index 8e2341a514..641cb566cb 100644
--- a/common.mk
+++ b/common.mk
@@ -927,19 +927,19 @@ OPTS =
# 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: