aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-29 06:39:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-29 06:39:22 +0000
commit74b70ad879d90a8bf8f5adf0f4461b4e0fa56485 (patch)
tree6c38b08a552b13b13e52417fcc33bb18e8aa33a8 /test
parent1673881f58371f441d23987c676e36322f566ade (diff)
downloadruby-74b70ad879d90a8bf8f5adf0f4461b4e0fa56485.tar.gz
* 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
Diffstat (limited to 'test')
-rw-r--r--test/ruby/memory_status.rb2
1 files changed, 1 insertions, 1 deletions
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