Move evp test programs input data to its own data dir
authorNicola Tuveri <nic.tuv@gmail.com>
Fri, 7 Sep 2018 15:27:56 +0000 (18:27 +0300)
committerNicola Tuveri <nic.tuv@gmail.com>
Sat, 29 Sep 2018 09:44:22 +0000 (12:44 +0300)
This is a manual backport of #3472 to 1.1.0.
This is a partial backport, limited only to evptests, as #3472 also
affected bntests, which has a completely different form in 1.1.0.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7152)

test/recipes/30-test_evp.t
test/recipes/30-test_evp_data/evpcase.txt [moved from test/evpcase.txt with 100% similarity]
test/recipes/30-test_evp_data/evpciph.txt [moved from test/evpciph.txt with 100% similarity]
test/recipes/30-test_evp_data/evpdigest.txt [moved from test/evpdigest.txt with 100% similarity]
test/recipes/30-test_evp_data/evpencod.txt [moved from test/evpencod.txt with 100% similarity]
test/recipes/30-test_evp_data/evpkdf.txt [moved from test/evpkdf.txt with 100% similarity]
test/recipes/30-test_evp_data/evpmac.txt [moved from test/evpmac.txt with 100% similarity]
test/recipes/30-test_evp_data/evppbe.txt [moved from test/evppbe.txt with 100% similarity]
test/recipes/30-test_evp_data/evppkey.txt [moved from test/evppkey.txt with 100% similarity]

index 701da3bcaf70cf323407ff3c0a340d7967f8d12d..c2e5a30fe3f659bf1953d0965cd026a004378d16 100644 (file)
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 
-use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test qw/:DEFAULT data_file/;
 
 setup("test_evp");
 
@@ -21,6 +21,6 @@ my @files = ( "evpciph.txt", "evpdigest.txt", "evpencod.txt", "evpkdf.txt",
 plan tests => scalar(@files);
 
 foreach my $f ( @files ) {
-    ok(run(test(["evp_test", srctop_file("test","$f")])),
+    ok(run(test(["evp_test", data_file("$f")])),
        "running evp_test $f");
 }