Skip to content
Browse files

Merge remote branch 'origin/master'

* origin/master:
  memtests/runtests: change ps options to also work on macos.
  • Loading branch information...
2 parents 88d7368 + 98a10de commit 1a4a792ec357039d24f54320f4353abeebadba99 @apenwarr committed Oct 6, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 memtests/runtests
View
2 memtests/runtests
@@ -19,7 +19,7 @@ def main():
rv = None
amounts = []
while rv is None:
- out = grab(['ps', '--no-headers', '-o', 'rss', str(p.pid)])
+ out = grab(['ps', '-o', 'rss=', str(p.pid)])
amount = int(out)
if amount != '0':
amounts.append(amount)

0 comments on commit 1a4a792

Please sign in to comment.
Something went wrong with that request. Please try again.