0
@@ -1,3 +1,8 @@
0
+Wed Jun 11 12:15:17 2008  Tanaka Akira  <akr@fsij.org>
0
+
0
+	* bootstraptest/runner.rb (assert_normal_exit): hide stderr output
0
+	  when success.
0
+
0
 Wed Jun 11 09:26:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
0
 
0
   * common.mk (encs): need to pass miniruby path for windows.

0
@@ -193,15 +193,30 @@ def assert_normal_exit(testsrc, message = '')
0
   $stderr.puts "\##{@count} #{@location}" if @verbose
0
   faildesc = nil
0
   filename = make_srcfile(testsrc)
0
-  `#{@ruby} -W0 #{filename}`
0
-  if $?.signaled?
0
-    signo = $?.termsig
0
+  old_stderr = $stderr.dup
0
+  begin
0
+    $stderr.reopen("assert_normal_exit_stderr.log", "w")
0
+    `#{@ruby} -W0 #{filename}`
0
+    status = $?
0
+  ensure
0
+    $stderr.reopen(old_stderr)
0
+    old_stderr.close
0
+  end
0
+  if status.signaled?
0
+    signo = status.termsig
0
     signame = Signal.list.invert[signo]
0
     sigdesc = "signal #{signo}"
0
     if signame
0
       sigdesc = "SIG#{signame} (#{sigdesc})"
0
     end
0
     faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
0
+    stderr_log = File.read("assert_normal_exit_stderr.log")
0
+    if !stderr_log.empty?
0
+      faildesc << "\n" if /\n\z/ !~ faildesc
0
+      stderr_log << "\n" if /\n\z/ !~ stderr_log
0
+      stderr_log.gsub!(/^.*\n/) { '| ' + $& }
0
+      faildesc << stderr_log
0
+    end
0
   end
0
   if !faildesc
0
     $stderr.print '.'