diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-24 11:04:26 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-25 08:42:16 +0900 |
| commit | a850be68a57dce65449766654aa1912b5fa660cb (patch) | |
| tree | c2ca2be18151af9e084f549cac032b749a958640 | |
| parent | 82ae46211341f926d79c6e2e26f4b9097625443c (diff) | |
| download | ruby-a850be68a57dce65449766654aa1912b5fa660cb.tar.gz | |
Moved NoMemoryError hook to Test::Unit::AutoRunner
| -rw-r--r-- | tool/lib/test/unit.rb | 4 | ||||
| -rw-r--r-- | tool/test/runner.rb | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb index 1034a993b0..146d6bb3c7 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -1135,6 +1135,10 @@ module Test abort @options.banner end @runner.run(@argv) || true + rescue NoMemoryError + system("cat /proc/meminfo") if File.exist?("/proc/meminfo") + system("ps x -opid,args,%cpu,%mem,nlwp,rss,vsz,wchan,stat,start,time,etime,blocked,caught,ignored,pending,f") if File.exist?("/bin/ps") + raise end def self.run(*args) diff --git a/tool/test/runner.rb b/tool/test/runner.rb index f8769857ad..38e7c0438c 100644 --- a/tool/test/runner.rb +++ b/tool/test/runner.rb @@ -35,10 +35,4 @@ if ENV['COVERAGE'] require_relative "#{tool_dir}/test-coverage.rb" end -begin - exit Test::Unit::AutoRunner.run(true, src_testdir) -rescue NoMemoryError - system("cat /proc/meminfo") if File.exist?("/proc/meminfo") - system("ps x -opid,args,%cpu,%mem,nlwp,rss,vsz,wchan,stat,start,time,etime,blocked,caught,ignored,pending,f") if File.exist?("/bin/ps") - raise -end +exit Test::Unit::AutoRunner.run(true, src_testdir) |