From ed22bf47cc551bb26f17fbaebadd06d1ff2b8948 Mon Sep 17 00:00:00 2001
From: Koichi Sasada <ko1@atdot.net>
Date: Wed, 29 Jul 2020 18:45:39 +0900
Subject: [PATCH] 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.
---
 bootstraptest/runner.rb | 10 ++++++++--
 1 file 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