Fix ${readsocket } eol-replacement. Bug 2630

[users/heiko/exim.git] / test / lib / Exim / Runtest.pm

diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm
index e41a29c8cb83cc0bb03b1375ecaf7d21657db55f..7ba079051c9e88fb9515408e303f57428f996606 100644 (file)
--- a/test/lib/Exim/Runtest.pm
+++ b/test/lib/Exim/Runtest.pm
@@ -119,6 +119,10 @@ sub flavour {
         $etc = shift;
     }
 
         $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;
     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 }
 
 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;
 }
 
     return sort keys %h;
 }
 


@@ -174,7 +178,7 @@ typical files in the F</etc> directory.
 
 =item B<flavours>()
 
 
 =item B<flavours>()
 

-Return a list of available flavours. It does so by scanning F<stdout/> and
+Return a list of available flavours. It does so by scanning F<log/>, F<stdout/> and

 F<stderr/> for I<flavour> files (extensions after the numerical prefix.
 
 =back
 F<stderr/> for I<flavour> files (extensions after the numerical prefix.
 
 =back