From a4c5d234045438e09ea4f5feed0ae50958604907 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 3 Jun 2019 20:47:32 +0900 Subject: [PATCH] benchmark/time_strptime.yml does not work with miniruby Since 72ad092960c413b6a5687c552747b20a5ed78b22, we cannot run full `make benchmark` because default BENCH_RUBY is miniruby and it fails to require 'time'. Using miniruby for benchmark by default seems reasonable for some cases, but now it's just bothering for people running full `make benchmark`. --- common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 3fd77afef6..58520a33c3 100755 --- a/common.mk +++ b/common.mk @@ -1163,7 +1163,7 @@ bisect-ruby: PHONY $(srcdir)/tool/bisect.sh ruby $(srcdir) COMPARE_RUBY = $(BASERUBY) -BENCH_RUBY = $(MINIRUBY) +BENCH_RUBY = $(RUNRUBY) ITEM = ARGS = $$(ls $(srcdir)/benchmark/*$(ITEM)*.{yml,rb} 2>/dev/null) OPTS = @@ -1176,7 +1176,7 @@ OPTS = benchmark: miniruby$(EXEEXT) update-benchmark-driver PHONY $(BASERUBY) -rrubygems -I$(srcdir)/benchmark/lib $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \ --executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \ - --executables="built-ruby::$(BENCH_RUBY) -r$(srcdir)/prelude --disable-gem" \ + --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \ $(ARGS) $(OPTS) run.gdb: