]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Make ossltest engine use in test/recipes/20-test_dgst.t platform agnostic
authorRichard Levitte <levitte@openssl.org>
Thu, 10 Mar 2022 12:29:25 +0000 (13:29 +0100)
committerRichard Levitte <levitte@openssl.org>
Sat, 12 Mar 2022 10:09:42 +0000 (11:09 +0100)
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17861)

(cherry picked from commit abdb2278d2b65ae87bee3121be83322e4219b396)

test/recipes/20-test_dgst.t

index eb7f940ff507096d3365d631aa8f4817c79d2cb7..a80ef9cf5d75a53e235641fa5e65c45f0cfe6f77 100644 (file)
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use OpenSSL::Test qw/:DEFAULT with srctop_file bldtop_file/;
+use OpenSSL::Test qw/:DEFAULT with srctop_file bldtop_dir/;
 use OpenSSL::Test::Utils;
 
 setup("test_dgst");
@@ -113,8 +113,8 @@ SKIP: {
         my $testdata = srctop_file('test', 'data.bin');
         # intentionally using -engine twice, please do not remove the duplicate line
         my @macdata = run(app(['openssl', 'dgst', '-sha1',
-                               '-engine', $^O eq 'linux' ? bldtop_file("engines", "ossltest.so") : "ossltest",
-                               '-engine', $^O eq 'linux' ? bldtop_file("engines", "ossltest.so") : "ossltest",
+                               '-engine', "ossltest",
+                               '-engine', "ossltest",
                                $testdata]), capture => 1);
         chomp(@macdata);
         my $expected = qr/SHA1\(\Q$testdata\E\)= 000102030405060708090a0b0c0d0e0f10111213/;