Moved NoMemoryError hook to Test::Unit::AutoRunner

ruby · Jul 24, 2019 · a850be6 · a850be6
1 parent 82ae462
commit a850be6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
@@ -1135,6 +1135,10 @@ def run
           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
@@ -35,10 +35,4 @@
   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)