X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0929ce9ca518b6987b63cf8659338ca434e07d9b..747736dc83324875bd6339f97f492747a3ad7fe5:/test/lib/Exim/Runtest.pm?ds=sidebyside diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm index 537cea1e9..6c2262f55 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|3\.\d+\.\d+)/ && 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 } - 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