diff options
author | Richard Levitte <levitte@openssl.org> | 2017-05-16 08:57:33 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-06-15 19:46:24 +0200 |
commit | c537e74ba32e28d747d8e747abfa6cfff75c44c1 (patch) | |
tree | 5eee0b8c61328eb00c6cc6d7757b4a54efde7c72 | |
parent | 46e5b661d435b11652b90cd9e06cbf6606d3b61a (diff) |
Move bn and evp test programs input data to their respective data dir
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3472)
-rw-r--r-- | test/recipes/10-test_bn.t | 4 | ||||
-rw-r--r-- | test/recipes/10-test_bn_data/bnexp.txt (renamed from test/bnexp.txt) | 0 | ||||
-rw-r--r-- | test/recipes/10-test_bn_data/bnmod.txt (renamed from test/bnmod.txt) | 0 | ||||
-rw-r--r-- | test/recipes/10-test_bn_data/bnmul.txt (renamed from test/bnmul.txt) | 0 | ||||
-rw-r--r-- | test/recipes/10-test_bn_data/bnshift.txt (renamed from test/bnshift.txt) | 0 | ||||
-rw-r--r-- | test/recipes/10-test_bn_data/bnsum.txt (renamed from test/bnsum.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp.t | 4 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evpciph.txt (renamed from test/evpciph.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evpdigest.txt (renamed from test/evpdigest.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evpencod.txt (renamed from test/evpencod.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evpkdf.txt (renamed from test/evpkdf.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evpmac.txt (renamed from test/evpmac.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evppbe.txt (renamed from test/evppbe.txt) | 0 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evppkey.txt (renamed from test/evppkey.txt) | 0 |
14 files changed, 4 insertions, 4 deletions
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 index 664f1a9af0..664f1a9af0 100644 --- a/test/bnexp.txt +++ b/test/recipes/10-test_bn_data/bnexp.txt diff --git a/test/bnmod.txt b/test/recipes/10-test_bn_data/bnmod.txt index 5ea4d031f2..5ea4d031f2 100644 --- a/test/bnmod.txt +++ b/test/recipes/10-test_bn_data/bnmod.txt diff --git a/test/bnmul.txt b/test/recipes/10-test_bn_data/bnmul.txt index dc13a9229e..dc13a9229e 100644 --- a/test/bnmul.txt +++ b/test/recipes/10-test_bn_data/bnmul.txt diff --git a/test/bnshift.txt b/test/recipes/10-test_bn_data/bnshift.txt index db30a2405c..db30a2405c 100644 --- a/test/bnshift.txt +++ b/test/recipes/10-test_bn_data/bnshift.txt diff --git a/test/bnsum.txt b/test/recipes/10-test_bn_data/bnsum.txt index 2d90067de8..2d90067de8 100644 --- a/test/bnsum.txt +++ b/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 index 33eede24fd..33eede24fd 100644 --- a/test/evpciph.txt +++ b/test/recipes/30-test_evp_data/evpciph.txt diff --git a/test/evpdigest.txt b/test/recipes/30-test_evp_data/evpdigest.txt index 91a7ec733e..91a7ec733e 100644 --- a/test/evpdigest.txt +++ b/test/recipes/30-test_evp_data/evpdigest.txt diff --git a/test/evpencod.txt b/test/recipes/30-test_evp_data/evpencod.txt index b75372d390..b75372d390 100644 --- a/test/evpencod.txt +++ b/test/recipes/30-test_evp_data/evpencod.txt diff --git a/test/evpkdf.txt b/test/recipes/30-test_evp_data/evpkdf.txt index fb8c270d8b..fb8c270d8b 100644 --- a/test/evpkdf.txt +++ b/test/recipes/30-test_evp_data/evpkdf.txt diff --git a/test/evpmac.txt b/test/recipes/30-test_evp_data/evpmac.txt index cd6a3d0c97..cd6a3d0c97 100644 --- a/test/evpmac.txt +++ b/test/recipes/30-test_evp_data/evpmac.txt diff --git a/test/evppbe.txt b/test/recipes/30-test_evp_data/evppbe.txt index f9e9947070..f9e9947070 100644 --- a/test/evppbe.txt +++ b/test/recipes/30-test_evp_data/evppbe.txt diff --git a/test/evppkey.txt b/test/recipes/30-test_evp_data/evppkey.txt index 3c3d090fb7..3c3d090fb7 100644 --- a/test/evppkey.txt +++ b/test/recipes/30-test_evp_data/evppkey.txt |