From 75cce8ddee8c108039d0329c4f84466aad0f9c3c Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Mon, 12 Jul 2021 15:32:02 +0200 Subject: [PATCH] 80-test_cmp_http.t: Remove -certout option where not needed Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/16052) --- test/recipes/80-test_cmp_http.t | 3 ++- test/recipes/80-test_cmp_http_data/Mock/test.cnf | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t index 92f11e8ac8a..75acc07a4c4 100644 --- a/test/recipes/80-test_cmp_http.t +++ b/test/recipes/80-test_cmp_http.t @@ -242,7 +242,8 @@ sub load_tests { } else { $line =~ s{-section,,}{-section,,-proxy,$proxy,}; } - $line =~ s{-section,,}{-section,,-certout,$result_dir/test.cert.pem,}; + $line =~ s{-section,,}{-section,,-certout,$result_dir/test.cert.pem,} + if $aspect ne "commands" || $line =~ m/,\s*-cmd\s*,\s*(ir|cr|p10cr|kur)\s*,/; $line =~ s{-section,,}{-config,../$test_config,-section,$server_name $aspect,}; my @fields = grep /\S/, split ",", $line; diff --git a/test/recipes/80-test_cmp_http_data/Mock/test.cnf b/test/recipes/80-test_cmp_http_data/Mock/test.cnf index 87dd575a8aa..0853893cd78 100644 --- a/test/recipes/80-test_cmp_http_data/Mock/test.cnf +++ b/test/recipes/80-test_cmp_http_data/Mock/test.cnf @@ -84,6 +84,7 @@ extracertsout = [commands] cmd = +certout = cacertsout = infotype = oldcert = -- 2.47.2