kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* bootstraptest/runner.rb (show_progress): extracted from assert_check.

Browse source 
(assert_check): use show_progress.
  (assert_normal_exit): ditto.
  (assert_finish): ditto.
  (flunk): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-06-14 14:07:02 +00:00
parent 614ec73fc8
commit 92c0438049
2 changed files with 84 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Tue Jun 14 23:02:36 2011 Tanaka Akira <akr@fsij.org>
* bootstraptest/runner.rb (show_progress): extracted from assert_check.
(assert_check): use show_progress.
(assert_normal_exit): ditto.
(assert_finish): ditto.
(flunk): ditto.
Tue Jun 14 22:51:42 2011 Tadayoshi Funaba <tadf@dotrb.org> Tue Jun 14 22:51:42 2011 Tadayoshi Funaba <tadf@dotrb.org>
* test/date/test_*.rb: added tests. * test/date/test_*.rb: added tests.

48
bootstraptest/runner.rb
View file

@ -155,11 +155,9 @@ def exec_test(pathes)
end end
end end
def assert_check(testsrc, message = '', opt = '') def show_progress(message = '')
$stderr.puts "\##{@count} #{@location}" if @verbose $stderr.puts "\##{@count} #{@location}" if @verbose
result = get_result_string(testsrc, opt) faildesc = yield
check_coredump
faildesc = yield(result)
if !faildesc if !faildesc
$stderr.print '.' $stderr.print '.'
else else
@ -171,6 +169,14 @@ rescue Exception => err
error err.message, message error err.message, message
end end
def assert_check(testsrc, message = '', opt = '')
show_progress(message) {
result = get_result_string(testsrc, opt)
check_coredump
yield(result)
}
end
def assert_equal(expected, testsrc, message = '') def assert_equal(expected, testsrc, message = '')
newtest newtest
assert_check(testsrc, message) {|result| assert_check(testsrc, message) {|result|
@ -215,13 +221,13 @@ def assert_valid_syntax(testsrc, message = '')
end end
def assert_normal_exit(testsrc, *rest) def assert_normal_exit(testsrc, *rest)
newtest
opt = {} opt = {}
opt = rest.pop if Hash === rest.last opt = rest.pop if Hash === rest.last
message, ignore_signals = rest message, ignore_signals = rest
message ||= '' message ||= ''
timeout = opt[:timeout] timeout = opt[:timeout]
newtest show_progress(message) {
$stderr.puts "\##{@count} #{@location}" if @verbose
faildesc = nil faildesc = nil
filename = make_srcfile(testsrc) filename = make_srcfile(testsrc)
old_stderr = $stderr.dup old_stderr = $stderr.dup
@ -265,23 +271,13 @@ def assert_normal_exit(testsrc, *rest)
end end
end end
end end
if !faildesc faildesc
$stderr.print '.' }
true
else
$stderr.print 'F'
error faildesc, message
false
end
rescue Exception => err
$stderr.print 'E'
error err.message, message
false
end end
def assert_finish(timeout_seconds, testsrc, message = '') def assert_finish(timeout_seconds, testsrc, message = '')
newtest newtest
$stderr.puts "\##{@count} #{@location}" if @verbose show_progress(message) {
faildesc = nil faildesc = nil
filename = make_srcfile(testsrc) filename = make_srcfile(testsrc)
io = IO.popen("#{@ruby} -W0 #{filename}") io = IO.popen("#{@ruby} -W0 #{filename}")
@ -301,21 +297,13 @@ def assert_finish(timeout_seconds, testsrc, message = '')
faildesc = pretty(testsrc, "not finished in #{timeout_seconds} seconds", nil) faildesc = pretty(testsrc, "not finished in #{timeout_seconds} seconds", nil)
end end
io.close io.close
if !faildesc faildesc
$stderr.print '.' }
else
$stderr.print 'F'
error faildesc, message
end
rescue Exception => err
$stderr.print 'E'
error err.message, message
end end
def flunk(message = '') def flunk(message = '')
newtest newtest
$stderr.print 'F' show_progress('') { message }
error message, ''
end end
def pretty(src, desc, result) def pretty(src, desc, result)