nagachika	2014-02-17 01:10:43 +0900 (Mon, 17 Feb 2014)

  New Revision: 45007

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

  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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/benchmark/driver.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45006)
+++ ruby_2_0_0/ChangeLog	(revision 45007)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Feb 17 01:09:52 2014  Eric Wong <e@8...>
+
+	* benchmark/driver: avoid large alloc in driver process
+	  [ruby-core:59869] [Bug #9430]
+
 Mon Feb 17 00:59:40 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (rb_thread_create_timer_thread): fix for platforms
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45006)
+++ ruby_2_0_0/version.h	(revision 45007)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-02-17"
-#define RUBY_PATCHLEVEL 425
+#define RUBY_PATCHLEVEL 426
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_0_0/benchmark/driver.rb
===================================================================
--- ruby_2_0_0/benchmark/driver.rb	(revision 45006)
+++ ruby_2_0_0/benchmark/driver.rb	(revision 45007)
@@ -242,7 +242,7 @@ class BenchmarkDriver https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/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_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44772


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