From: Armin Fuerst <armin@fuerst.priv.at>
Date: Fri, 11 Feb 2022 18:46:12 +0000 (+0100)
Subject: Prefix output to avoid random ok to confuse test parser
X-Git-Tag: openssl-3.2.0-alpha1~2934
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b089d546242bbc073aefb6f6471586e484118863;p=thirdparty%2Fopenssl.git

Prefix output to avoid random ok to confuse test parser

Prefix output of generated dh parameters to avoid misinterpretation
of lines beginning with ok[^a-zA-Z0-9] as a testresult.

Also corrected indent and removed useless comma after last item.

Fixes #17480

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17689)
---

diff --git a/test/recipes/15-test_gendhparam.t b/test/recipes/15-test_gendhparam.t
index b95695b4dc0..37178af643f 100644
--- a/test/recipes/15-test_gendhparam.t
+++ b/test/recipes/15-test_gendhparam.t
@@ -118,12 +118,12 @@ my @testdata = (
 #        expect => [ 'BEGIN DH PARAMETERS', 'G:    5' ],
 #        message   => 'DH safe prime generator using an alias',
 #    },
-     {
+    {
         algorithm => 'DHX',
         pkeyopts => [ 'type:generator', 'safeprime-generator:5'],
         expect => [ 'ERROR' ],
         message   => 'safe prime generator should fail for DHX',
-    },
+    }
 );
 
 plan skip_all => "DH isn't supported in this build" if disabled("dh");
@@ -165,7 +165,7 @@ sub compareline {
     }
     print "-----------------\n";
     foreach (@lines) {
-        print $_;
+        print "# ".$_;
     }
     print "-----------------\n";
     foreach my $ex (@expected) {