naruse	2014-02-22 16:22:12 +0900 (Sat, 22 Feb 2014)

  New Revision: 45121

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45121

  Log:
    merge revision(s) 44772: [Backport #9430]
    
    benchmark/driver: avoid large alloc in driver process
    
    * benchmark/driver: avoid large alloc in driver process
      [ruby-core:59869] [Bug #9430]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/benchmark/driver.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45120)
+++ ruby_2_1/version.h	(revision 45121)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 65
+#define RUBY_PATCHLEVEL 66
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_1/benchmark/driver.rb
===================================================================
--- ruby_2_1/benchmark/driver.rb	(revision 45120)
+++ ruby_2_1/benchmark/driver.rb	(revision 45121)
@@ -242,7 +242,7 @@ class BenchmarkDriver https://github.com/ruby/ruby/blob/trunk/ruby_2_1/benchmark/driver.rb#L242
     cmd = "#{executable} #{@ruby_arg} #{file}"
 
     m = Benchmark.measure{
-      `#{cmd}`
+      system(cmd, out: File::NULL)
     }
 
     if $? != 0

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44772


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