diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-08 07:58:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-08 07:58:03 +0000 |
| commit | 286eaeb24f815211651e7443585188e42993eec1 (patch) | |
| tree | e350bb34de2524ac26bde4dae5f36078dd3f2e61 | |
| parent | 65accad30a056321856765fcac35655afbd9f44e (diff) | |
memory_status.rb: find proper ps
* test/ruby/memory_status.rb (Memory::PSCMD): use ps command which
outputs expected result. [ruby-dev:48370] [Bug #10010]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/memory_status.rb | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Jul 8 16:58:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/ruby/memory_status.rb (Memory::PSCMD): use ps command which + outputs expected result. [ruby-dev:48370] [Bug #10010] + Tue Jul 8 14:45:17 2014 Koichi Sasada <ko1@atdot.net> * parse.y (dsymbol_alloc): set global_symbols.minor_marked to 0. diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index f8e097a9cd..5347e34cb6 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -82,8 +82,12 @@ module Memory end end else - PSCMD = ["ps", "-ovsz=","-orss=", "-p"] PAT = /^\s*(\d+)\s+(\d+)$/ + require_relative 'find_executable' + if PSCMD = EnvUtil.find_executable("ps", "-ovsz=", "-orss=", "-p", $$.to_s) {|out| PAT =~ out} + PSCMD.pop + end + raise MiniTest::Skip, "ps command not found" unless PSCMD keys << :size << :rss def self.read_status |