From afb254d02b20e877230367c0799ab27505b585f4 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 15 Jun 2021 16:11:51 +0200 Subject: TEST: Change 'catdir' to 'catfile' when dealing with files, in run_tests.pl Reviewed-by: Paul Dale Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/15767) --- test/run_tests.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/run_tests.pl b/test/run_tests.pl index ea054bc189..0ed97b2ca9 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -33,11 +33,11 @@ my $recipesdir = catdir($srctop, "test", "recipes"); my $libdir = rel2abs(catdir($srctop, "util", "perl")); my $jobs = $ENV{HARNESS_JOBS} // 1; -$ENV{OPENSSL_CONF} = rel2abs(catdir($srctop, "apps", "openssl.cnf")); +$ENV{OPENSSL_CONF} = rel2abs(catfile($srctop, "apps", "openssl.cnf")); $ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "test")); $ENV{OPENSSL_MODULES} = rel2abs(catdir($bldtop, "providers")); $ENV{OPENSSL_ENGINES} = rel2abs(catdir($bldtop, "engines")); -$ENV{CTLOG_FILE} = rel2abs(catdir($srctop, "test", "ct", "log_list.cnf")); +$ENV{CTLOG_FILE} = rel2abs(catfile($srctop, "test", "ct", "log_list.cnf")); my %tapargs = ( verbosity => $ENV{HARNESS_VERBOSE} ? 1 : 0, -- cgit v1.2.3