From cb193560e0da17a41b40ce574a2349f1d4d59ed1 Mon Sep 17 00:00:00 2001 From: Nicola Tuveri Date: Fri, 7 Sep 2018 18:27:56 +0300 Subject: [PATCH] Move evp test programs input data to its own data dir 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 (Merged from https://github.com/openssl/openssl/pull/7152) --- test/recipes/30-test_evp.t | 4 ++-- test/{ => recipes/30-test_evp_data}/evpcase.txt | 0 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 9 files changed, 2 insertions(+), 2 deletions(-) rename test/{ => recipes/30-test_evp_data}/evpcase.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/30-test_evp.t b/test/recipes/30-test_evp.t index 701da3bcaf..c2e5a30fe3 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"); @@ -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"); } diff --git a/test/evpcase.txt b/test/recipes/30-test_evp_data/evpcase.txt similarity index 100% rename from test/evpcase.txt rename to test/recipes/30-test_evp_data/evpcase.txt 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 -- 2.25.1