summaryrefslogtreecommitdiff
path: root/benchmark
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-09 15:45:02 (GMT)
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-09 15:45:02 (GMT)
commit5b9ff710770593204f4d19f7fa62f30495a64cd2 (patch)
tree2cf6810e50b21da898e9fec0dafaf4ef9ea4a664 /benchmark
parent70785c1c5a7131ef51c145f13b508023b8589e63 (diff)
common.mk: upgrade benchmark_driver to v0.14
benchmark/driver.rb: deal with breaking changes which are actually introduced for this driver. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'benchmark')
-rwxr-xr-xbenchmark/driver.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index 2a4e3a6..4894584 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