summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2020-07-29 18:45:39 +0900
committerKoichi Sasada <ko1@atdot.net>2020-07-29 18:45:39 +0900
commited22bf47cc551bb26f17fbaebadd06d1ff2b8948 (patch)
tree200f4b3a207db120ef900b1e6420aef56680f917
parentdd6f5aba0e07c6e65cad026317d1a77dbb72f56e (diff)
display stderr output even if core dump files
On btest, stderr messages are not displayed if core files are generated. There is no reason to skip it, so this patch display stderr and check core files.
-rwxr-xr-xbootstraptest/runner.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 56b4b12230..94a90f5e95 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -261,6 +261,14 @@ rescue Exception => err
$stderr.print 'E'
$stderr.puts if @verbose
error err.message, message
+ensure
+ begin
+ check_coredump
+ rescue CoreDumpError => err
+ $stderr.print 'E'
+ $stderr.puts if @verbose
+ error err.message, message
+ end
end
def show_limit(testsrc, opt = '', **argh)
@@ -275,7 +283,6 @@ end
def assert_check(testsrc, message = '', opt = '', **argh)
show_progress(message) {
result = get_result_string(testsrc, opt, **argh)
- check_coredump
yield(result)
}
end
@@ -453,7 +460,6 @@ def get_result_string(src, opt = '', **argh)
`#{@ruby} -W0 #{opt} #{filename}`
ensure
raise Interrupt if $? and $?.signaled? && $?.termsig == Signal.list["INT"]
- raise CoreDumpError, "core dumped" if $? and $?.coredump?
end
else
eval(src).to_s