aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbenchmark/driver.rb12
-rw-r--r--common.mk2
2 files changed, 7 insertions, 7 deletions
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index 2a4e3a6fa5..4894584864 100755
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -44,7 +44,7 @@ if __FILE__ == $0
execs: [],
rbenvs: [],
repeat: 1,
- verbose: 1,
+ verbose: [],
dir: File.dirname(__FILE__),
}
@@ -72,8 +72,8 @@ if __FILE__ == $0
o.on('--repeat-count [NUM]', "Repeat count"){|n|
opt[:repeat] = n.to_i
}
- o.on('--verbose [LEVEL]', 'Show some verbose outputs: 0, 1, 2 (default: 1)'){|v|
- opt[:verbose] = Integer(v)
+ o.on('-v', '--verbose', 'Verbose mode. Multiple -v options increase visilibity (max: 2)'){|v|
+ opt[:verbose] << '-v'
}
#
@@ -94,12 +94,12 @@ if __FILE__ == $0
yamls += BenchmarkDriver.new(opt).files
# Many variables in Makefile are not `foo,bar` but `foo bar`. So it's converted here.
- execs = opt[:execs].map { |exec| ['--executables', exec.shellsplit.join(',')] }.flatten
+ execs = opt[:execs].map { |exec| ['--executables', exec] }.flatten
rbenv = opt[:rbenvs].map { |r| ['--rbenv', r] }
BenchmarkDriver.run(
- *yamls, *execs, *rbenv,
+ *yamls, *execs, *rbenv, *opt[:verbose],
"--runner=#{opt[:runner]}", "--output=#{opt[:output]}",
- "--verbose=#{opt[:verbose]}", "--repeat-count=#{opt[:repeat]}",
+ "--repeat-count=#{opt[:repeat]}",
)
end
diff --git a/common.mk b/common.mk
index aae11a25f6..71cd42d42f 100644
--- a/common.mk
+++ b/common.mk
@@ -42,7 +42,7 @@ GEM_PATH =
GEM_VENDOR =
BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver
-BENCHMARK_DRIVER_GIT_REF = v0.13.2
+BENCHMARK_DRIVER_GIT_REF = v0.14.0
SIMPLECOV_GIT_URL = git://github.com/colszowka/simplecov.git
SIMPLECOV_GIT_REF = v0.15.0
SIMPLECOV_HTML_GIT_URL = git://github.com/colszowka/simplecov-html.git