usa	2014-02-14 15:22:02 +0900 (Fri, 14 Feb 2014)

  New Revision: 44942

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

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

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/benchmark/driver.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44941)
+++ ruby_1_9_3/ChangeLog	(revision 44942)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Feb 14 15:21:21 2014  Eric Wong <e@8...>
+
+	* benchmark/driver: avoid large alloc in driver process
+	  [ruby-core:59869] [Bug #9430]
+
 Fri Feb 14 15:17:17 2014  Yusuke Endoh  <mame@t...>
 
 	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44941)
+++ ruby_1_9_3/version.h	(revision 44942)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 523
+#define RUBY_PATCHLEVEL 524
 
 #define RUBY_RELEASE_DATE "2014-02-14"
 #define RUBY_RELEASE_YEAR 2014
Index: ruby_1_9_3/benchmark/driver.rb
===================================================================
--- ruby_1_9_3/benchmark/driver.rb	(revision 44941)
+++ ruby_1_9_3/benchmark/driver.rb	(revision 44942)
@@ -220,7 +220,7 @@ class BenchmarkDriver https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/benchmark/driver.rb#L220
   def measure executable, file
     cmd = "#{executable} #{file}"
     m = Benchmark.measure{
-      `#{cmd}`
+      system(cmd, out: File::NULL)
     }
 
     if $? != 0

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44772-44773


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