mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Merge run methods
This commit is contained in:
parent
374cc7231e
commit
1fd2a66a93
Notes:
git
2021-09-11 08:48:39 +09:00
1 changed files with 5 additions and 9 deletions
|
@ -1510,13 +1510,6 @@ module Test
|
||||||
options
|
options
|
||||||
end
|
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.
|
# Top level driver, controls all output and filtering.
|
||||||
|
|
||||||
|
@ -1564,8 +1557,11 @@ module Test
|
||||||
include Test::Unit::TimeoutOption
|
include Test::Unit::TimeoutOption
|
||||||
include Test::Unit::RunCount
|
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
|
rescue NoMemoryError
|
||||||
system("cat /proc/meminfo") if File.exist?("/proc/meminfo")
|
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")
|
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")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue