Moved NoMemoryError hook

Moved NoMemoryError hook from AutoRunner.run to Runner#run, so
it will work even in non-autorunning mode.

1 files changed, 8 insertions, 4 deletions

diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 146d6bb3c7..9cded97a33 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -1072,6 +1072,14 @@ module Test
       include Test::Unit::TimeoutOption
       include Test::Unit::RunCount
 
+      def run(argv)
+        super
+      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
+
       class << self; undef autorun; end
 
       @@stop_auto_run = false
@@ -1135,10 +1143,6 @@ 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)