X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/45f35410b4bdd59614dd9811ee99aea6a5d1164c..c656546cbb8008a108ad66fb5880f883ab15ed21:/test/lib/Exim/Runtest.pm?ds=inline diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm index e41a29c8c..7ba079051 100644 --- a/test/lib/Exim/Runtest.pm +++ b/test/lib/Exim/Runtest.pm @@ -119,6 +119,10 @@ sub flavour { $etc = shift; } + if (open(my $f, '-|', 'openssl version')) { + <$f> =~ /1.1.1/ && return "openssl_1_1_1"; + } + if (open(my $f, '<', "$etc/os-release")) { local $_ = join '', <$f>; my ($id) = /^ID="?(.*?)"?\s*$/m; @@ -137,7 +141,7 @@ sub flavour { sub flavours { my %h = map { /\.(\S+)$/, 1 } - grep { !/\.orig$/ } glob('stdout/*.*'), glob('stderr/*.*'); + grep { !/\.orig$/ } glob('stdout/*.*'), glob('stderr/*.*'), glob('log/*.*'); return sort keys %h; } @@ -174,7 +178,7 @@ typical files in the F directory. =item B() -Return a list of available flavours. It does so by scanning F and +Return a list of available flavours. It does so by scanning F, F and F for I files (extensions after the numerical prefix. =back