Move bn and evp test programs input data to their respective data dir
authorRichard Levitte <levitte@openssl.org>
Tue, 16 May 2017 06:57:33 +0000 (08:57 +0200)
committerRichard Levitte <levitte@openssl.org>
Thu, 15 Jun 2017 17:46:24 +0000 (19:46 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3472)

14 files changed:
test/recipes/10-test_bn.t
test/recipes/10-test_bn_data/bnexp.txt [moved from test/bnexp.txt with 100% similarity]
test/recipes/10-test_bn_data/bnmod.txt [moved from test/bnmod.txt with 100% similarity]
test/recipes/10-test_bn_data/bnmul.txt [moved from test/bnmul.txt with 100% similarity]
test/recipes/10-test_bn_data/bnshift.txt [moved from test/bnshift.txt with 100% similarity]
test/recipes/10-test_bn_data/bnsum.txt [moved from test/bnsum.txt with 100% similarity]
test/recipes/30-test_evp.t
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 f5c3fb1..a663009 100644 (file)
@@ -12,7 +12,7 @@ use warnings;
 
 use Math::BigInt;
 
-use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test qw/:DEFAULT data_file/;
 
 setup("test_bn");
 
@@ -22,7 +22,7 @@ my @files = (
 plan tests => 1 + scalar(@files);
 
 foreach my $f ( @files ) {
-    ok(run(test(["bntest", srctop_file("test", $f)])),
+    ok(run(test(["bntest", data_file($f)])),
         "running bntest $f");
 }
 ok(run(test(["bntest"])), "running bntest");
index a90b3a9..b498244 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");
 
@@ -20,6 +20,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");
 }