Change OpenSSL::Test to be an extension of Test::More

It became tedious as well as error prone to have all recipes use
Test::More as well as OpenSSL::Test.  The easier way is to make
OpenSSL::Test an extension of Test::More, thereby having all version
checks as well as future checks firmly there.  Additionally, that
allows us to extend existing Test::More functions if the need would
arise.

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

diff --git a/test/recipes/00-check_testexes.t b/test/recipes/00-check_testexes.t
index 6f3ced323ffe9505c3371523c099dabe9b4d5359..4fc9e1b3afc48205bd3315355ef37abc3542e137 100644 (file)
--- a/test/recipes/00-check_testexes.t
+++ b/test/recipes/00-check_testexes.t
@@ -3,8 +3,6 @@
 use strict;
 
 use File::Spec::Functions;
-use Test::More 0.96;
-
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("check_testexes");
@@ -51,7 +49,7 @@ my $MINFO = top_file("MINFO");
 
      plan tests => $numtests;
 
-     skip "because $MINFO found. If you want this test to run, please do 'perl util/mkfiles.pl > $MINFO'", 1
+     skip "because $MINFO not found. If you want this test to run, please do 'perl util/mkfiles.pl > $MINFO'", 1
         unless %foundfiles;
 
      foreach (sort keys %foundfiles) {

diff --git a/test/recipes/10-test_bn.t b/test/recipes/10-test_bn.t
index 2c42cacf6ada961373f7abb68e1939ff7ad4deae..29b449fec94cc37777ea74d0bdfe93c51c099aee 100644 (file)
--- a/test/recipes/10-test_bn.t
+++ b/test/recipes/10-test_bn.t
@@ -5,7 +5,6 @@ use warnings;
 
 use Math::BigInt;
 
-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 809579c7b9fd74e3cca636a4c2f0c52aae474e61..e338b0bb22432c5527deae1efac1ce8070484bf3 100644 (file)
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 2de47c1304efbc8391b30cbc45fcdf82265ebe7b..bbda19af36ee3719503ae88046ddce3eb9e7b968 100644 (file)
--- a/test/recipes/15-test_ec.t
+++ b/test/recipes/15-test_ec.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 c686a66a50cc819256a830e2cae5874f18dacb61..2eaeb0d827a0c40305fb5100ca86bed07a0f9653 100644 (file)
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 e423152f1edf2cefeb6625dbbc0694f447fd1a0a..bd5a436508ea4f3f86f490e7f8a043b16ceb7504 100644 (file)
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.t
@@ -7,7 +7,6 @@ use File::Spec::Functions qw/catfile/;
 use File::Copy;
 use File::Compare qw/compare_text/;
 use File::Basename;
-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 42a59419b4d1a9a6b7bb7c840338255576e32f44..6779a0b1af353a851aefe549fdf4bf958c55a050 100644 (file)
--- a/test/recipes/25-test_crl.t
+++ b/test/recipes/25-test_crl.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 4387bf5886da3a5562d7a53ffed67b8668918486..9427bdebf8406627e93dbd70cdb51510b69e2539 100644 (file)
--- a/test/recipes/25-test_gen.t
+++ b/test/recipes/25-test_gen.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 7dc1eb79274d24d9815b2e532498fd718eab36e4..3a4dbb47bd3f224fc8899b0800f8b8e89fa62e12 100644 (file)
--- a/test/recipes/25-test_pkcs7.t
+++ b/test/recipes/25-test_pkcs7.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 5e4ea476d9006dc88d44b952a18157d514f15cbd..4f9de779ed21fc940712c7404a6985c777c5fac1 100644 (file)
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 d09ae56d520f207e80f427643d093330c1d3a1af..b223c0dd4f31f8bfdbfcb1e20a009455aacfa7e2 100644 (file)
--- a/test/recipes/25-test_sid.t
+++ b/test/recipes/25-test_sid.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 a88097c1eefde350d3345a52fb43b4701d8ca632..10897a1d71d6ce7a61114e87237e550c6088e4ff 100644 (file)
--- a/test/recipes/25-test_verify.t
+++ b/test/recipes/25-test_verify.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec::Functions qw/canonpath/;
-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 b11feb07ae6c4df404a116125a5ff3be42c9991f..e2d795a6c4281dab701dc0f7d2525d334067e935 100644 (file)
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use File::Spec;
-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 c2e636754e3d0e902538c904b43f9af148584240..c097b6f143a6d8478d502a1936d1605553fa595c 100644 (file)
--- a/test/recipes/30-test_engine.t
+++ b/test/recipes/30-test_engine.t
@@ -3,7 +3,6 @@
 use strict;
 use warnings;
 
-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 eedd78c23562374aa3f6c96d36e720f4329c2a60..9d5ce6f187feeb9de5456ede76266f5dafb430b3 100644 (file)
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -3,7 +3,6 @@
 use strict;
 use warnings;
 
-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 385e054554260a02075e0c45581fead7e0052896..0f90b212cf2b98f44c374e385c72321f3843c79a 100644 (file)
--- a/test/recipes/30-test_evp_extra.t
+++ b/test/recipes/30-test_evp_extra.t
@@ -3,7 +3,6 @@
 use strict;
 use warnings;
 
-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 446427f01f67caacdc342cfcdd2b6b64836a2363..b044163283403c85f1ceab231e5012aa5a863761 100644 (file)
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -6,7 +6,6 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile devnull/;
 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 32a68ed1b3a3c4fe04263df3fb8b6109cc5dac12..cc2786fbdb1ab462610a66e17ab03a6282e2a5b9 100644 (file)
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -6,7 +6,6 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/catfile/;
 use File::Compare qw/compare_text/;
-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 02e7aa2f88d7b1ce57dffbcd2138cfa7978615a0..7d7c96efe055922a7a6ae7157551ce667e8e5f56 100644 (file)
--- a/test/recipes/80-test_ocsp.t
+++ b/test/recipes/80-test_ocsp.t
@@ -6,7 +6,6 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/devnull catfile/;
 use File::Copy;
-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 380e54ac697072f9756b15f03d6ecd66ff90ebad..246994421f302ab8b86c02a624c195483cdd8ffc 100644 (file)
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -6,7 +6,6 @@ use warnings;
 use POSIX;
 use File::Spec;
 use File::Copy;
-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 524c0e92f836d57a9ae5bfdf7cca7a794f66959c..fffd11d660e467bcd0422069cb5d283f16b73bd5 100644 (file)
--- a/test/recipes/80-test_tsa.t
+++ b/test/recipes/80-test_tsa.t
@@ -6,7 +6,6 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile/;
 use File::Compare;
-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 72613e1cc37be312210797d705990dfd241c275d..e97128ff7e7293b7e7b90641c514e9a4ab4b0471 100644 (file)
--- a/test/recipes/90-test_gost2814789.t
+++ b/test/recipes/90-test_gost2814789.t
@@ -2,7 +2,6 @@
 
 use strict;
 use warnings;
-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 32eda36dac061ef7122bc416d56ff2b7b1d7af96..4eef7c17a322ec65e1383b45c15bb082a5d3d54a 100644 (file)
--- a/test/recipes/tconversion.pl
+++ b/test/recipes/tconversion.pl
@@ -5,7 +5,6 @@ use warnings;
 
 use File::Compare qw/compare_text/;
 use File::Copy;
-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 207e8016076adc0638a10f6565664d8596b7118f..8b9ddbe03c8d1eb395d6e797471d272dcc7ccbad 100644 (file)
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -3,12 +3,15 @@ package OpenSSL::Test;
 use strict;
 use warnings;
 
+use Test::More 0.96;
+
 use Exporter;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 $VERSION = "0.5";
 @ISA = qw(Exporter);
-@EXPORT = qw(setup indir app test run);
-@EXPORT_OK = qw(top_dir top_file pipe with cmdstr quotify));
+@EXPORT = (@Test::More::EXPORT, qw(setup indir app test run));
+@EXPORT_OK = (@Test::More::EXPORT_OK, qw(top_dir top_file pipe with cmdstr
+                                         quotify));
 
 
 use File::Copy;
@@ -16,7 +19,6 @@ use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir
                              catdir catfile splitpath catpath devnull abs2rel
                              rel2abs/;
 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 be86ca2cb2564b1a8dcfb1fae9dd8524350582ca..145778eb27063bdacce8a8fe909ef88cd706d1f7 100644 (file)
--- a/test/testlib/OpenSSL/Test/Simple.pm
+++ b/test/testlib/OpenSSL/Test/Simple.pm
@@ -10,7 +10,6 @@ $VERSION = "0.1";
 @EXPORT = qw(simple_test);
 
 
-use Test::More 0.96;
 use OpenSSL::Test;
 
 # args: