diff options
author | Richard Levitte <levitte@openssl.org> | 2018-04-11 09:54:59 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-04-11 12:04:18 +0200 |
commit | 708a6a17592865590344eca541cbfccd472d7b45 (patch) | |
tree | 774383795d165cab6675109f9ff1914208be25de /util/perl/OpenSSL | |
parent | 63a65d16acca53622a08861cdde8fe0e79beb522 (diff) |
OpenSSL::Test: add data_dir()
For test recipes that want to use the directory of the data directory
or a subdirectory thereof, rather than just individual files.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5928)
Diffstat (limited to 'util/perl/OpenSSL')
-rw-r--r-- | util/perl/OpenSSL/Test.pm | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm index f4b1b50d8b..19141e91ac 100644 --- a/util/perl/OpenSSL/Test.pm +++ b/util/perl/OpenSSL/Test.pm @@ -607,6 +607,23 @@ sub srctop_file { =over 4 +=item B<data_dir LIST> + +LIST is a list of directories that make up a path from the data directory +associated with the test (see L</DESCRIPTION> above). +C<data_dir> returns the resulting directory as a string, adapted to the local +operating system. + +=back + +=cut + +sub data_dir { + return __data_dir(@_); +} + +=over 4 + =item B<data_file LIST, FILENAME> LIST is a list of directories that make up a path from the data directory @@ -967,6 +984,12 @@ sub __data_file { return catfile($directories{SRCDATA},@_,$f); } +sub __data_dir { + BAIL_OUT("Must run setup() first") if (! $test_name); + + return catdir($directories{SRCDATA},@_); +} + sub __results_file { BAIL_OUT("Must run setup() first") if (! $test_name); |