Add version numbers on some modules we use.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/test/recipes/00-check_testexes.t b/test/recipes/00-check_testexes.t
index 5f8f1138ccb824b370fc432300095d38644e8f34..6f3ced323ffe9505c3371523c099dabe9b4d5359 100644 (file)
--- a/test/recipes/00-check_testexes.t
+++ b/test/recipes/00-check_testexes.t
@@ -3,7 +3,7 @@
 use strict;
 
 use File::Spec::Functions;
-use Test::More;
+use Test::More 0.96;
 
 use OpenSSL::Test qw/:DEFAULT top_file/;
 

diff --git a/test/recipes/10-test_bn.t b/test/recipes/10-test_bn.t
index 6dce97327b43fe61338230bf9454ed1aaef6dabf..2c42cacf6ada961373f7abb68e1939ff7ad4deae 100644 (file)
--- a/test/recipes/10-test_bn.t
+++ b/test/recipes/10-test_bn.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Math::BigInt;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_bn");

diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t
index 897e4480cb1e1b520be019d3c5b99e8964a0ce55..809579c7b9fd74e3cca636a4c2f0c52aae474e61 100644 (file)
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_dsa");

diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t
index 6619a480d3318a5594700be7a7205424e77e9ac9..2de47c1304efbc8391b30cbc45fcdf82265ebe7b 100644 (file)
--- a/test/recipes/15-test_ec.t
+++ b/test/recipes/15-test_ec.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_ec");

diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index 9b17fbef9dac30ddaa0fabc286f5805c98b9d36f..c686a66a50cc819256a830e2cae5874f18dacb61 100644 (file)
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_rsa");

diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t
index 813e20120e4a6fa7dc7cc8e99ede8dd45658274c..e423152f1edf2cefeb6625dbbc0694f447fd1a0a 100644 (file)
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.t
@@ -7,7 +7,7 @@ use File::Spec::Functions qw/catfile/;
 use File::Copy;
 use File::Compare qw/compare_text/;
 use File::Basename;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_enc");

diff --git a/test/recipes/25-test_crl.t b/test/recipes/25-test_crl.t
index 3bcd2d1e4a4b11a2fb0a91355c5f4350dab94aa9..42a59419b4d1a9a6b7bb7c840338255576e32f44 100644 (file)
--- a/test/recipes/25-test_crl.t
+++ b/test/recipes/25-test_crl.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_crl");

diff --git a/test/recipes/25-test_gen.t b/test/recipes/25-test_gen.t
index 2f50ee4cb30b83ee9da11ccc6017cfb460ae6244..4387bf5886da3a5562d7a53ffed67b8668918486 100644 (file)
--- a/test/recipes/25-test_gen.t
+++ b/test/recipes/25-test_gen.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_gen");

diff --git a/test/recipes/25-test_pkcs7.t b/test/recipes/25-test_pkcs7.t
index 586c9180fb3e5639dabc2f2dfa836badd6f329bb..7dc1eb79274d24d9815b2e532498fd718eab36e4 100644 (file)
--- a/test/recipes/25-test_pkcs7.t
+++ b/test/recipes/25-test_pkcs7.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_pkcs7");

diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index 50c18a9c1bbab05163e46a5826f3bf7ed8ce0262..5e4ea476d9006dc88d44b952a18157d514f15cbd 100644 (file)
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_req");

diff --git a/test/recipes/25-test_sid.t b/test/recipes/25-test_sid.t
index 710eab429ac7eec2112ab856d8ea6f2e22c5b1d8..d09ae56d520f207e80f427643d093330c1d3a1af 100644 (file)
--- a/test/recipes/25-test_sid.t
+++ b/test/recipes/25-test_sid.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_sid");

diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
index 032a932b46f9671b3d3a127211906dc9975bb513..a88097c1eefde350d3345a52fb43b4701d8ca632 100644 (file)
--- a/test/recipes/25-test_verify.t
+++ b/test/recipes/25-test_verify.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec::Functions qw/canonpath/;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
 
 setup("test_verify");

diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index 5098db46f001f7c788d76e9c0ea7a3449ab8ac64..b11feb07ae6c4df404a116125a5ff3be42c9991f 100644 (file)
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_x509");

diff --git a/test/recipes/30-test_engine.t b/test/recipes/30-test_engine.t
index 420c19a868f63a8e921d34251cd034857b909b74..c2e636754e3d0e902538c904b43f9af148584240 100644 (file)
--- a/test/recipes/30-test_engine.t
+++ b/test/recipes/30-test_engine.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test;
 
 setup("test_engine");

diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index bd135f8dd0529e6bc29fab0e9cb9b6950d0822de..eedd78c23562374aa3f6c96d36e720f4329c2a60 100644 (file)
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_evp");

diff --git a/test/recipes/30-test_evp_extra.t b/test/recipes/30-test_evp_extra.t
index 60e2d38c5b50965ca9c2e18a4d371460170b1e8f..385e054554260a02075e0c45581fead7e0052896 100644 (file)
--- a/test/recipes/30-test_evp_extra.t
+++ b/test/recipes/30-test_evp_extra.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test;
 
 setup("test_evp_extra");

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index 6278672e8cc92de68bd7c3955886e0f743fc2e13..446427f01f67caacdc342cfcdd2b6b64836a2363 100644 (file)
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -5,8 +5,8 @@ use warnings;
 
 use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile devnull/;
-use File::Path qw/remove_tree/;
-use Test::More;
+use File::Path 2.00 qw/remove_tree/;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT cmdstr top_file quotify/;
 
 setup("test_ca");

diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 1775ac406766c657f4c100f2714137157c934171..32a68ed1b3a3c4fe04263df3fb8b6109cc5dac12 100644 (file)
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/catfile/;
 use File::Compare qw/compare_text/;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
 
 setup("test_cms");

diff --git a/test/recipes/80-test_ocsp.t b/test/recipes/80-test_ocsp.t
index cc4e56f08a022f80d156e246ac3bc84de651a7b1..02e7aa2f88d7b1ce57dffbcd2138cfa7978615a0 100644 (file)
--- a/test/recipes/80-test_ocsp.t
+++ b/test/recipes/80-test_ocsp.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/devnull catfile/;
 use File::Copy;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT with pipe top_dir/;
 
 setup("test_ocsp");

diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t
index 6b3a15766eae34f12d6b4b420aabae32de5443cf..380e54ac697072f9756b15f03d6ecd66ff90ebad 100644 (file)
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec;
 use File::Copy;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT with top_file/;
 
 setup("test_ssl");

diff --git a/test/recipes/80-test_tsa.t b/test/recipes/80-test_tsa.t
index 132209713f330ffc759bb5d507db1c34f058b64c..524c0e92f836d57a9ae5bfdf7cca7a794f66959c 100644 (file)
--- a/test/recipes/80-test_tsa.t
+++ b/test/recipes/80-test_tsa.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile/;
 use File::Compare;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT cmdstr top_file/;
 
 setup("test_tsa");

diff --git a/test/recipes/90-test_gost2814789.t b/test/recipes/90-test_gost2814789.t
index b09e062cc7b62d1415b75a9771cba9bbabeddd80..72613e1cc37be312210797d705990dfd241c275d 100644 (file)
--- a/test/recipes/90-test_gost2814789.t
+++ b/test/recipes/90-test_gost2814789.t
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_dir/;
 
 setup("test_gost2814789");

diff --git a/test/recipes/tconversion.pl b/test/recipes/tconversion.pl
index 94039e932b255e93c3aa585ce0329f51761c95dc..32eda36dac061ef7122bc416d56ff2b7b1d7af96 100644 (file)
--- a/test/recipes/tconversion.pl
+++ b/test/recipes/tconversion.pl
@@ -5,7 +5,7 @@ use warnings;
 
 use File::Compare qw/compare_text/;
 use File::Copy;
-use Test::More;
+use Test::More 0.96;
 use lib 'testlib';
 use OpenSSL::Test qw/:DEFAULT top_file/;
 

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index ad8b04dff90b4faee77094910e05a149e42956e0..644f4dd6a5adf8ddcaa885af2f2479a576db4dd3 100644 (file)
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -15,8 +15,8 @@ use File::Copy;
 use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir
                              catdir catfile splitpath catpath devnull abs2rel
                              rel2abs/;
-use File::Path qw/remove_tree mkpath/;
-use Test::More;
+use File::Path 2.00 qw/remove_tree mkpath/;
+use Test::More 0.96;
 
 
 my $test_name = undef;

diff --git a/test/testlib/OpenSSL/Test/Simple.pm b/test/testlib/OpenSSL/Test/Simple.pm
index 94f6cf935b20dbd5a56d94d9c779f45a38fa42c1..be86ca2cb2564b1a8dcfb1fae9dd8524350582ca 100644 (file)
--- a/test/testlib/OpenSSL/Test/Simple.pm
+++ b/test/testlib/OpenSSL/Test/Simple.pm
@@ -10,7 +10,7 @@ $VERSION = "0.1";
 @EXPORT = qw(simple_test);
 
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test;
 
 # args: