From 74b70ad879d90a8bf8f5adf0f4461b4e0fa56485 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 29 Feb 2012 06:39:22 +0000 Subject: [PATCH] * test/ruby/memory_status.rb (Memory): syntax error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ test/ruby/memory_status.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 344e12cd8b..8a12bfadf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 29 15:38:50 2012 NAKAMURA Usaku + + * test/ruby/memory_status.rb (Memory): syntax error. + Wed Feb 29 13:06:42 2012 Nobuyoshi Nakada * test/ruby/memory_status.rb: use /proc/self/status if it is in diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index 2817e16c56..e391441036 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -3,7 +3,7 @@ module Memory vals = [] case - when File.exist?(procfile = "/proc/self/status") and (pat = /^Vm(\w+):\s+(\d+)/) =~ File.binread(procfile) + when File.exist?(procfile = "/proc/self/status") && (pat = /^Vm(\w+):\s+(\d+)/) =~ File.binread(procfile) PROC_FILE = procfile VM_PAT = pat def self.read_status