X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/c9eab729ed1dfc555a784aa98d4e58f004ef1e42..d7571ac555518797c3553f6080f6aab3fda6ec58:/test/lib/Exim/Runtest.pm?ds=sidebyside

diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm
index 8d22544bf..e41a29c8c 100644
--- 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);
+            ($ENV{build} ? "$_/build-$ENV{build}" : ()),
             "$_/build-$os-$arch" . ($ENV{EXIM_BUILD_SUFFIX} ? ".$ENV{EXIM_BUILD_SUFFIX}" : '');
         } @candidates;
 
@@ -136,7 +137,7 @@ sub flavour {
 
 sub flavours {
     my %h = map { /\.(\S+)$/, 1 }
-            glob('stdout/*.*'), glob('stderr/*.*');
+            grep { !/\.orig$/ } glob('stdout/*.*'), glob('stderr/*.*');
     return sort keys %h;
 }