summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-06-15 16:11:51 +0200
committerMatt Caswell <matt@openssl.org>2021-06-16 15:20:05 +0100
commitafb254d02b20e877230367c0799ab27505b585f4 (patch)
tree2119cd196fc2d223e974f6b4fae2c2643968444b
parent079f8d36ff6c5720a2dcbb8cbf996f05005fffb5 (diff)
TEST: Change 'catdir' to 'catfile' when dealing with files, in run_tests.pl
Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15767)
-rw-r--r--test/run_tests.pl4
1 files 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,