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>

25 files changed, 6 insertions, 29 deletions

diff --git a/test/recipes/00-check_testexes.t b/test/recipes/00-check_testexes.t
index 6f3ced323f..4fc9e1b3af 100644
--- 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 2c42cacf6a..29b449fec9 100644
--- 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 809579c7b9..e338b0bb22 100644
--- 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 2de47c1304..bbda19af36 100644
--- 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 c686a66a50..2eaeb0d827 100644
--- 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 e423152f1e..bd5a436508 100644
--- 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 42a59419b4..6779a0b1af 100644
--- 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 4387bf5886..9427bdebf8 100644
--- 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 7dc1eb7927..3a4dbb47bd 100644
--- 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 5e4ea476d9..4f9de779ed 100644
--- 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 d09ae56d52..b223c0dd4f 100644
--- 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 a88097c1ee..10897a1d71 100644
--- 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 b11feb07ae..e2d795a6c4 100644
--- 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 c2e636754e..c097b6f143 100644
--- 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 eedd78c235..9d5ce6f187 100644
--- 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 385e054554..0f90b212cf 100644
--- 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 446427f01f..b044163283 100644
--- 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 32a68ed1b3..cc2786fbdb 100644
--- 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 02e7aa2f88..7d7c96efe0 100644
--- 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 380e54ac69..246994421f 100644
--- 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 524c0e92f8..fffd11d660 100644
--- 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 72613e1cc3..e97128ff7e 100644
--- 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 32eda36dac..4eef7c17a3 100644
--- 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 207e801607..8b9ddbe03c 100644
--- 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 be86ca2cb2..145778eb27 100644
--- 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: