diff options
author | Richard Levitte <levitte@openssl.org> | 2015-04-30 08:51:24 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-09-07 16:10:58 +0200 |
commit | fd99c6b599a8ed87b726caaa6d88c6915a60e0f4 (patch) | |
tree | a975a4996ec2cc4b84cd6d3be5026b54929271cd /test/testlib | |
parent | caadc54381af04dd49d9812737d40fea320c8674 (diff) |
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>
Diffstat (limited to 'test/testlib')
-rw-r--r-- | test/testlib/OpenSSL/Test.pm | 8 | ||||
-rw-r--r-- | test/testlib/OpenSSL/Test/Simple.pm | 1 |
2 files changed, 5 insertions, 4 deletions
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: |