From 7b918be3d43a043abfa47772da90e856cdd7a355 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 26 Nov 2012 09:30:32 +0000 Subject: [PATCH] * common.mk: specify label `built-ruby'. * benchmark/driver.rb: quote path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ benchmark/driver.rb | 2 +- common.mk | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d724580ebe..014360d49e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 26 18:22:56 2012 Koichi Sasada + + * common.mk: specify label `built-ruby'. + + * benchmark/driver.rb: quote path. + Mon Nov 26 18:26:28 2012 KOSAKI Motohiro * signal.c (signal_exec): add volatile to make sure setjmp safe. diff --git a/benchmark/driver.rb b/benchmark/driver.rb index 5719a7a4c3..695dc41aff 100644 --- a/benchmark/driver.rb +++ b/benchmark/driver.rb @@ -88,7 +88,7 @@ class BenchmarkDriver @start_time = Time.now message @start_time @execs.each_with_index{|(path, label, version), i| - message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at #{path}" + message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at \"#{path}\"" } end end diff --git a/common.mk b/common.mk index bf9c607e5b..e30462fdf0 100644 --- a/common.mk +++ b/common.mk @@ -940,17 +940,17 @@ OPTS = benchmark: $(PROGRAM) PHONY $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ - --executables="$(COMPARE_RUBY); $(RUNRUBY)" \ + --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \ --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS) benchmark-each: $(PROGRAM) PHONY $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ - --executables="$(COMPARE_RUBY); $(RUNRUBY)" \ + --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \ --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS) tbench: $(PROGRAM) PHONY $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ - --executables="$(COMPARE_RUBY); $(RUNRUBY)" \ + --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \ --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS) run.gdb: