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
DKIM: More validation of DNS key record. Bug 1926
[users/heiko/exim.git]
/
test
/
lib
/
Exim
/
Runtest.pm
diff --git
a/test/lib/Exim/Runtest.pm
b/test/lib/Exim/Runtest.pm
index ce91084f40b9d42a9d3ecc4e125c4e70ea2c4218..537cea1e9513df139f68515be3261d18810c574e 100644
(file)
--- a/
test/lib/Exim/Runtest.pm
+++ b/
test/lib/Exim/Runtest.pm
@@
-64,8
+64,10
@@
sub dynamic_socket {
sub exim_binary {
# two simple cases, absolute path or relative path and executable
sub exim_binary {
# two simple cases, absolute path or relative path and executable
- return @_ if $_[0] =~ /^\//;
- return Cwd::abs_path(shift), @_ if -x $_[0];
+ if (@_) {
+ return @_ if $_[0] =~ /^\//;
+ return Cwd::abs_path(shift), @_ if -x $_[0];
+ }
# so we're still here, if the simple approach didn't help.
# so we're still here, if the simple approach didn't help.
@@
-101,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;