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>

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) {

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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/;
 

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;

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: