summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-22 07:22:12 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-22 07:22:12 +0000
commitc3729ca38f62d0d0712ef6aecf447c80c9bbeec8 (patch)
tree7afb86ca2deaf03d3bc544eac6c41481389c41ed
parentdc8c558ac281a451d2e207b13da5b1922c95bf64 (diff)
downloadruby-c3729ca38f62d0d0712ef6aecf447c80c9bbeec8.tar.gz
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_1@45121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--benchmark/driver.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
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 b0527e9a72..54fd73d42b 100644
--- 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