diff options
author | Richard Levitte <levitte@openssl.org> | 2021-06-21 08:35:28 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-06-22 17:37:54 +0200 |
commit | 321a48cdd833e839c175085597e024d504ad23d6 (patch) | |
tree | 1d74ebbeb8d78eda316c8484d6c255359c731e0a | |
parent | e493d6e0ca4157741d2e4cfcb91fd367851f5771 (diff) |
test/recipes/80-test_cmp_http.t: use app() rather than cmd()
OpenSSL::Test::cmd() should be used with caution, as it is for special
cases only.
It's preferable to use OpenSSL::Test::app() or OpenSSL::Test::test().
Fixes #15833
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15846)
-rw-r--r-- | test/recipes/80-test_cmp_http.t | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t index dddc1db918..68130a364a 100644 --- a/test/recipes/80-test_cmp_http.t +++ b/test/recipes/80-test_cmp_http.t @@ -47,7 +47,7 @@ $proxy = chop_dblquot($ENV{http_proxy} // $ENV{HTTP_PROXY} // $proxy); $proxy =~ s{^https?://}{}i; my $no_proxy = $ENV{no_proxy} // $ENV{NO_PROXY}; -my $app = "apps/openssl cmp"; +my @app = qw(openssl cmp); # the CMP server configuration consists of: my $ca_dn; # The CA's Distinguished Name @@ -129,16 +129,14 @@ sub test_cmp_http { my $title = shift; my $params = shift; my $expected_result = shift; - my $path_app = bldtop_dir($app); $params = [ '-server', "127.0.0.1:$server_port", @$params ] unless grep { $_ eq '-server' } @$params; + my $cmd = app([@app, @$params]); - unless (is(my $actual_result = run(cmd([$path_app, @$params,])), - $expected_result, - $title)) { + unless (is(my $actual_result = run($cmd), $expected_result, $title)) { if ($faillog) { my $quote_spc_empty = sub { $_ eq "" ? '""' : $_ =~ m/ / ? '"'.$_.'"' : $_ }; - my $invocation = "$path_app ".join(' ', map $quote_spc_empty->($_), @$params); + my $invocation = cmdstr($cmd, display => 1); print $faillog "$server_name $aspect \"$title\" ($i/$n)". " expected=$expected_result actual=$actual_result\n"; print $faillog "$invocation\n\n"; @@ -266,7 +264,7 @@ sub load_tests { sub start_mock_server { my $args = $_[0]; # optional further CLI arguments - my $cmd = cmdstr(app(['openssl', 'cmp', '-config', 'server.cnf', + my $cmd = cmdstr(app([@app, '-config', 'server.cnf', $args ? $args : ()]), display => 1); print "Current directory is ".getcwd()."\n"; print "Launching mock server: $cmd\n"; |