From c537e74ba32e28d747d8e747abfa6cfff75c44c1 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 16 May 2017 08:57:33 +0200 Subject: [PATCH] Move bn and evp test programs input data to their respective data dir Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3472) --- test/recipes/10-test_bn.t | 4 ++-- test/{ => recipes/10-test_bn_data}/bnexp.txt | 0 test/{ => recipes/10-test_bn_data}/bnmod.txt | 0 test/{ => recipes/10-test_bn_data}/bnmul.txt | 0 test/{ => recipes/10-test_bn_data}/bnshift.txt | 0 test/{ => recipes/10-test_bn_data}/bnsum.txt | 0 test/recipes/30-test_evp.t | 4 ++-- test/{ => recipes/30-test_evp_data}/evpciph.txt | 0 test/{ => recipes/30-test_evp_data}/evpdigest.txt | 0 test/{ => recipes/30-test_evp_data}/evpencod.txt | 0 test/{ => recipes/30-test_evp_data}/evpkdf.txt | 0 test/{ => recipes/30-test_evp_data}/evpmac.txt | 0 test/{ => recipes/30-test_evp_data}/evppbe.txt | 0 test/{ => recipes/30-test_evp_data}/evppkey.txt | 0 14 files changed, 4 insertions(+), 4 deletions(-) rename test/{ => recipes/10-test_bn_data}/bnexp.txt (100%) rename test/{ => recipes/10-test_bn_data}/bnmod.txt (100%) rename test/{ => recipes/10-test_bn_data}/bnmul.txt (100%) rename test/{ => recipes/10-test_bn_data}/bnshift.txt (100%) rename test/{ => recipes/10-test_bn_data}/bnsum.txt (100%) rename test/{ => recipes/30-test_evp_data}/evpciph.txt (100%) rename test/{ => recipes/30-test_evp_data}/evpdigest.txt (100%) rename test/{ => recipes/30-test_evp_data}/evpencod.txt (100%) rename test/{ => recipes/30-test_evp_data}/evpkdf.txt (100%) rename test/{ => recipes/30-test_evp_data}/evpmac.txt (100%) rename test/{ => recipes/30-test_evp_data}/evppbe.txt (100%) rename test/{ => recipes/30-test_evp_data}/evppkey.txt (100%) diff --git a/test/recipes/10-test_bn.t b/test/recipes/10-test_bn.t index f5c3fb14eb..a663009ce9 100644 --- a/test/recipes/10-test_bn.t +++ b/test/recipes/10-test_bn.t @@ -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"); diff --git a/test/bnexp.txt b/test/recipes/10-test_bn_data/bnexp.txt similarity index 100% rename from test/bnexp.txt rename to test/recipes/10-test_bn_data/bnexp.txt diff --git a/test/bnmod.txt b/test/recipes/10-test_bn_data/bnmod.txt similarity index 100% rename from test/bnmod.txt rename to test/recipes/10-test_bn_data/bnmod.txt diff --git a/test/bnmul.txt b/test/recipes/10-test_bn_data/bnmul.txt similarity index 100% rename from test/bnmul.txt rename to test/recipes/10-test_bn_data/bnmul.txt diff --git a/test/bnshift.txt b/test/recipes/10-test_bn_data/bnshift.txt similarity index 100% rename from test/bnshift.txt rename to test/recipes/10-test_bn_data/bnshift.txt diff --git a/test/bnsum.txt b/test/recipes/10-test_bn_data/bnsum.txt similarity index 100% rename from test/bnsum.txt rename to test/recipes/10-test_bn_data/bnsum.txt diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t index a90b3a989b..b49824401a 100644 --- a/test/recipes/30-test_evp.t +++ b/test/recipes/30-test_evp.t @@ -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"); } diff --git a/test/evpciph.txt b/test/recipes/30-test_evp_data/evpciph.txt similarity index 100% rename from test/evpciph.txt rename to test/recipes/30-test_evp_data/evpciph.txt diff --git a/test/evpdigest.txt b/test/recipes/30-test_evp_data/evpdigest.txt similarity index 100% rename from test/evpdigest.txt rename to test/recipes/30-test_evp_data/evpdigest.txt diff --git a/test/evpencod.txt b/test/recipes/30-test_evp_data/evpencod.txt similarity index 100% rename from test/evpencod.txt rename to test/recipes/30-test_evp_data/evpencod.txt diff --git a/test/evpkdf.txt b/test/recipes/30-test_evp_data/evpkdf.txt similarity index 100% rename from test/evpkdf.txt rename to test/recipes/30-test_evp_data/evpkdf.txt diff --git a/test/evpmac.txt b/test/recipes/30-test_evp_data/evpmac.txt similarity index 100% rename from test/evpmac.txt rename to test/recipes/30-test_evp_data/evpmac.txt diff --git a/test/evppbe.txt b/test/recipes/30-test_evp_data/evppbe.txt similarity index 100% rename from test/evppbe.txt rename to test/recipes/30-test_evp_data/evppbe.txt diff --git a/test/evppkey.txt b/test/recipes/30-test_evp_data/evppkey.txt similarity index 100% rename from test/evppkey.txt rename to test/recipes/30-test_evp_data/evppkey.txt -- GitLab