diff options
| author | Hiroshi SHIBATA <[email protected]> | 2021-09-08 12:04:10 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2021-09-11 08:48:03 +0900 |
| commit | 1fd2a66a93a4065b6be725066044107045c81d01 (patch) | |
| tree | 13f223abdf4e121e1dee9262ee8339e14714e231 /tool/lib/test | |
| parent | 374cc7231e4dd0ded505aad45d74d7533ba58f22 (diff) | |
Merge run methods
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4813
Diffstat (limited to 'tool/lib/test')
| -rw-r--r-- | tool/lib/test/unit.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb index 8d303f4336..4a89cca5b2 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -1511,13 +1511,6 @@ module Test 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. def _run args = [] @@ -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") |