From: Richard Levitte <levitte@openssl.org>
Date: Mon, 21 Jun 2021 13:18:19 +0000 (+0200)
Subject: test/recipes/81-test_cmp_cli.t: use app() rather than cmd()
X-Git-Tag: openssl-3.0.0-beta2~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b1c9b0d7527f946755f6fc9784b45e34cb16a17;p=thirdparty%2Fopenssl.git

test/recipes/81-test_cmp_cli.t: use app() rather than cmd()

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)
---

diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t
index 8cf787cb260..fd1a1b06076 100644
--- a/test/recipes/81-test_cmp_cli.t
+++ b/test/recipes/81-test_cmp_cli.t
@@ -28,7 +28,7 @@ plan skip_all => "These tests are not supported in a fuzz build"
 plan skip_all => "These tests are not supported in a no-cmp build"
     if disabled("cmp");
 
-my $app = bldtop_dir("apps/openssl cmp");
+my @app = qw(openssl cmp);
 
 my @cmp_basic_tests = (
     [ "show help",                        [ "-help"               ], 1 ],
@@ -53,7 +53,7 @@ foreach (@cmp_basic_tests) {
     my $title = $$_[0];
     my $params = $$_[1];
     my $expected = $$_[2];
-    ok($expected == run(cmd([$app, "-config", '', @$params])),
+    ok($expected == run(app([@app, "-config", '', @$params])),
        $title);
 }
 
@@ -66,7 +66,7 @@ foreach (@cmp_server_tests) {
     my $rsp_cert = srctop_file('test',  'certs', 'ee-cert-1024.pem');
     my $outfile = result_file("test.certout.pem");
     ok($expected ==
-       run(cmd([$app, "-config", '', @$extra_args,
+       run(app([@app, "-config", '', @$extra_args,
                 "-use_mock_srv", "-srv_ref", "mock server",
                 "-srv_secret", $secret,
                 "-rsp_cert", $rsp_cert,