merge revision(s) 44772: [Backport ruby#9430]

nurse · nurse · commit c3729ca38f62 · 2014-02-22T07:22:12.000Z
benchmark/driver: avoid large alloc in driver process * benchmark/driver: avoid large alloc in driver process [ruby-core:59869] [Bug ruby#9430] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
@@ -242,7 +242,7 @@ def measure executable, file
     cmd = "#{executable} #{@ruby_arg} #{file}"
 
     m = Benchmark.measure{
-      `#{cmd}`
+      system(cmd, out: File::NULL)
     }
 
     if $? != 0
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ def measure executable, file`
`242`	`242`	`cmd = "#{executable} #{@ruby_arg} #{file}"`
`243`	`243`
`244`	`244`	`m = Benchmark.measure{`
`245`		- `#{cmd}`
	`245`	`+ system(cmd, out: File::NULL)`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`if $? != 0`