зеркало из https://github.com/github/ruby.git
Merge run methods
This commit is contained in:
Родитель
374cc7231e
Коммит
1fd2a66a93
|
@ -1510,13 +1510,6 @@ module Test
|
|||
options
|
||||
end
|
||||
|
||||
##
|
||||
# Begins the full test run. Delegates to +runner+'s #_run method.
|
||||
|
||||
def run args = []
|
||||
self.class.runner._run(args)
|
||||
end
|
||||
|
||||
##
|
||||
# Top level driver, controls all output and filtering.
|
||||
|
||||
|
@ -1564,8 +1557,11 @@ module Test
|
|||
include Test::Unit::TimeoutOption
|
||||
include Test::Unit::RunCount
|
||||
|
||||
def run(argv)
|
||||
super
|
||||
##
|
||||
# Begins the full test run. Delegates to +runner+'s #_run method.
|
||||
|
||||
def run(argv = [])
|
||||
self.class.runner._run(argv)
|
||||
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")
|
||||
|
|
Загрузка…
Ссылка в новой задаче