summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 16:10:43 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 16:10:43 +0000
commit89424b13b077e3c88d618f253f07607aecbaecc5 (patch)
treef39af16b5a12aa3d82ebe8ac4d90a12af296a19a
parentb8cab3fc3b2ba2208aed9620fc46c58f09ab40ac (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--benchmark/driver.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73a6dc0b00..8683bf333e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 17 01:09:52 2014 Eric Wong <e@80x24.org>
+
+ * benchmark/driver: avoid large alloc in driver process
+ [ruby-core:59869] [Bug #9430]
+
Mon Feb 17 00:59:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_pthread.c (rb_thread_create_timer_thread): fix for platforms
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index 695dc41aff..cbc72cf604 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -242,7 +242,7 @@ class BenchmarkDriver
cmd = "#{executable} #{@ruby_arg} #{file}"
m = Benchmark.measure{
- `#{cmd}`
+ system(cmd, out: File::NULL)
}
if $? != 0
diff --git a/version.h b/version.h
index 2fe80f5868..444adc3f21 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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