From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Sat, 20 Jun 2020 15:07:52 +0000 (+0200)
Subject: test/run_tests.pl: Improve newline output for VFO and VFP mode
X-Git-Tag: openssl-3.0.0-alpha4~51
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=6bb74ecb87f496faa777b609a03a2ce422b60197;ds=inline

test/run_tests.pl: Improve newline output for VFO and VFP mode

Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/12175)
---

diff --git a/test/run_tests.pl b/test/run_tests.pl
index bd83a6b988..8a4e770a75 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -134,7 +134,6 @@ $eres = eval {
         my $class = shift;
         my %opts = %{ shift() };
         my $failure_verbosity = $openssl_args{failure_verbosity};
-        print "\n" if $failure_verbosity == 1 || $failure_verbosity == 2;
         my @plans = (); # initial level, no plan yet
         my $output_buffer = "";
 
@@ -171,11 +170,12 @@ $eres = eval {
                     } elsif ($is_test) { # result of a test
                         pop @plans if @plans && --($plans[-1]) <= 0;
                         print $output_buffer if !$is_ok;
-                        print $self->as_string."\n"
+                        print "\n".$self->as_string
                             if !$is_ok || $failure_verbosity == 2;
                         $output_buffer = "";
-                    } else { # typically comment or unknown
-                        $output_buffer .= $self->as_string."\n";
+                    } elsif ($self->as_string ne "") {
+                        # typically is_comment or is_unknown
+                        $output_buffer .= "\n".$self->as_string;
                     }
                 }
             }