summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xbootstraptest/runner.rb8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4eb9b80..df05a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 14 23:16:22 2011 Tanaka Akira <akr@fsij.org>
+
+ * bootstraptest/runner.rb (show_progress): refine verbose mode.
+ (exec_test): ditto.
+
Tue Jun 14 23:02:36 2011 Tanaka Akira <akr@fsij.org>
* bootstraptest/runner.rb (show_progress): extracted from assert_check.
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index c54a157..df58ca5 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -136,6 +136,7 @@ def exec_test(pathes)
@location = nil
pathes.each do |path|
$stderr.print "\n#{File.basename(path)} "
+ $stderr.puts if @verbose
load File.expand_path(path)
end
$stderr.puts
@@ -156,16 +157,21 @@ def exec_test(pathes)
end
def show_progress(message = '')
- $stderr.puts "\##{@count} #{@location}" if @verbose
+ if @verbose
+ $stderr.print "\##{@count} #{@location} "
+ end
faildesc = yield
if !faildesc
$stderr.print '.'
+ $stderr.puts if @verbose
else
$stderr.print 'F'
+ $stderr.puts if @verbose
error faildesc, message
end
rescue Exception => err
$stderr.print 'E'
+ $stderr.puts if @verbose
error err.message, message
end