git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update security contact
[users/heiko/exim.git]
/
test
/
lib
/
Exim
/
Runtest.pm
diff --git
a/test/lib/Exim/Runtest.pm
b/test/lib/Exim/Runtest.pm
index 8d22544bfdcdd7de26d5a0d8e2ce688e82f22619..7ba079051c9e88fb9515408e303f57428f996606 100644
(file)
--- a/
test/lib/Exim/Runtest.pm
+++ b/
test/lib/Exim/Runtest.pm
@@
-103,6
+103,7
@@
sub exim_binary {
my $os = `$_/scripts/os-type`;
my $arch = `$_/scripts/arch-type`;
chomp($os, $arch);
my $os = `$_/scripts/os-type`;
my $arch = `$_/scripts/arch-type`;
chomp($os, $arch);
+ ($ENV{build} ? "$_/build-$ENV{build}" : ()),
"$_/build-$os-$arch" . ($ENV{EXIM_BUILD_SUFFIX} ? ".$ENV{EXIM_BUILD_SUFFIX}" : '');
} @candidates;
"$_/build-$os-$arch" . ($ENV{EXIM_BUILD_SUFFIX} ? ".$ENV{EXIM_BUILD_SUFFIX}" : '');
} @candidates;
@@
-118,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;
@@
-136,7
+141,7
@@
sub flavour {
sub flavours {
my %h = map { /\.(\S+)$/, 1 }
sub flavours {
my %h = map { /\.(\S+)$/, 1 }
- g
lob('stdout/*.*'), glob('stderr
/*.*');
+ g
rep { !/\.orig$/ } glob('stdout/*.*'), glob('stderr/*.*'), glob('log
/*.*');
return sort keys %h;
}
return sort keys %h;
}
@@
-173,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