diff options
author | Richard Levitte <richard@levitte.org> | 2016-01-25 15:48:35 +0100 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-01-25 17:53:55 +0100 |
commit | 83365051f5d91dece1973016dbdd6ce7541a5bcf (patch) | |
tree | a752b7cfd97211b091f643b132763a753147880a /test/testlib | |
parent | dc193c9c5e914c74fd0f51fe4fe86fbd5910536e (diff) |
Make tests use configdata.pm rather than parsing Makefile
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/testlib')
-rw-r--r-- | test/testlib/OpenSSL/Test/Utils.pm | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/test/testlib/OpenSSL/Test/Utils.pm b/test/testlib/OpenSSL/Test/Utils.pm index 5312c205a0..eed44244b8 100644 --- a/test/testlib/OpenSSL/Test/Utils.pm +++ b/test/testlib/OpenSSL/Test/Utils.pm @@ -7,7 +7,7 @@ use Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); $VERSION = "0.1"; @ISA = qw(Exporter); -@EXPORT = qw(disabled); +@EXPORT = qw(disabled config); =head1 NAME @@ -19,13 +19,15 @@ OpenSSL::Test::Utils - test utility functions disabled("dh"); + config("no_shared"); + =head1 DESCRIPTION This module provides utility functions for the testing framework. =cut -use OpenSSL::Test; +use OpenSSL::Test qw/:DEFAULT top_file/; =over 4 @@ -36,6 +38,10 @@ In a scalar context returns 1 if any of the features in ARRAY is disabled. In an array context returns an array with each element set to 1 if the corresponding feature is disabled and 0 otherwise. +=item B<config STRING> + +Returns an item from the %config hash in \$TOP/configdata.pm. + =back =cut @@ -70,6 +76,18 @@ sub disabled { return 0; } +our %config; +sub config { + if (!%config) { + # We eval it so it doesn't run at compile time of this file. + # The latter would have top_dir() complain that setup() hasn't + # been run yet. + my $configdata = top_file("configdata.pm"); + eval { require $configdata; %config = %configdata::config }; + } + return $config{$_[0]}; +} + =head1 SEE ALSO L<OpenSSL::Test> |