The branch openssl-3.0 has been updated via 21467ec273818e70a05ddece1019a13796c0fd26 (commit) from 16535ba9b86dcb99558201e66613f018fb1d3f65 (commit)
- Log ----------------------------------------------------------------- commit 21467ec273818e70a05ddece1019a13796c0fd26 Author: Tomas Mraz <to...@openssl.org> Date: Wed Jan 12 09:55:43 2022 +0100 test_gendhparam: Drop expected error output Otherwise it sometimes confuses the TAP parser. Fixes #17480 Reviewed-by: Bernd Edlinger <bernd.edlin...@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/17481) (cherry picked from commit 3bfb7239daf3d6a89476e163dc925c641d356729) ----------------------------------------------------------------------- Summary of changes: test/recipes/15-test_gendhparam.t | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/recipes/15-test_gendhparam.t b/test/recipes/15-test_gendhparam.t index b5fe644889..b95695b4dc 100644 --- a/test/recipes/15-test_gendhparam.t +++ b/test/recipes/15-test_gendhparam.t @@ -140,9 +140,17 @@ foreach my $test (@testdata) { push(@pkeyopts, '-pkeyopt'); push(@pkeyopts, $_); } - my @lines = run(app(['openssl', 'genpkey', '-genparam', + my @lines; + if ($expected[0] eq 'ERROR') { + @lines = run(app(['openssl', 'genpkey', '-genparam', + '-algorithm', $alg, '-text', @pkeyopts], + stderr => undef), + capture => 1); + } else { + @lines = run(app(['openssl', 'genpkey', '-genparam', '-algorithm', $alg, '-text', @pkeyopts]), - capture => 1); + capture => 1); + } ok(compareline(\@lines, \@expected), $msg); }