k0kubun	2018-07-10 00:45:02 +0900 (Tue, 10 Jul 2018)

  New Revision: 63916

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63916

  Log:
    common.mk: upgrade benchmark_driver to v0.14
    
    benchmark/driver.rb: deal with breaking changes which are actually
    introduced for this driver.

  Modified files:
    trunk/benchmark/driver.rb
    trunk/common.mk
Index: benchmark/driver.rb
===================================================================
--- benchmark/driver.rb	(revision 63915)
+++ benchmark/driver.rb	(revision 63916)
@@ -44,7 +44,7 @@ if __FILE__ == $0 https://github.com/ruby/ruby/blob/trunk/benchmark/driver.rb#L44
     execs: [],
     rbenvs: [],
     repeat: 1,
-    verbose: 1,
+    verbose: [],
     dir: File.dirname(__FILE__),
   }
 
@@ -72,8 +72,8 @@ if __FILE__ == $0 https://github.com/ruby/ruby/blob/trunk/benchmark/driver.rb#L72
     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 https://github.com/ruby/ruby/blob/trunk/benchmark/driver.rb#L94
   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
Index: common.mk
===================================================================
--- common.mk	(revision 63915)
+++ common.mk	(revision 63916)
@@ -42,7 +42,7 @@ GEM_PATH = https://github.com/ruby/ruby/blob/trunk/common.mk#L42
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/