X-Git-Url: https://git.exim.org/buildfarm-client.git/blobdiff_plain/32d057cf275dde00e46491fd4eb5c43a7c936c5c..07b2e94d2ceb0e418efe2ebdbc555c559c0aead3:/run_build

diff --git a/run_build b/run_build
index fe3ea92..14842ab 100755
--- a/run_build
+++ b/run_build
@@ -36,6 +36,7 @@ our $VERSION = 'REL_0.1';
 
 use strict;
 use warnings;
+use 5.010;
 use Config;
 use Fcntl qw(:flock :seek);
 use File::Path;
@@ -43,7 +44,7 @@ use File::Copy;
 use File::Basename;
 use File::Temp;
 use File::Spec;
-use FindBin qw'$Bin';
+use FindBin qw'$RealBin';
 use IO::Handle;
 use POSIX qw(:signal_h strftime);
 use Data::Dumper;
@@ -71,6 +72,7 @@ BEGIN
             : 'xxxxxx'
         );
     }
+    push @INC, getcwd();
 }
 
 use EximBuild::SCM;
@@ -83,14 +85,13 @@ if ($0 =~ /(.*)\.pl$/) {
     exec $1, @ARGV;
 }
 
-die "$0: please use an umask of 022\n"
-    if umask > 022;
+if (umask != 022) {
+    umask 022;
+    say "$0: forced umask to 022" if -t;
+}
 
 my %module_hooks;
 my $orig_dir = getcwd();
-push @INC, $orig_dir;
-
-umask 022;
 
 # make sure we exit nicely on any normal interrupt
 # so the cleanup handler gets called.
@@ -1057,10 +1058,13 @@ sub make_test
       }
     }
     writelog('test',\@makeout);
+    send_result('Test',$status,\@makeout) if $status;
+
+    @makeout = `cat $exim/test/run-summary.log`;
+    writelog('test-results',\@makeout);
+
     print "======== make test logs ===========\n",@makeout
       if ($verbose > 1);
-
-    send_result('Test',$status,\@makeout) if $status;
     $steps_completed .= " Test";
 }
 
@@ -1452,9 +1456,10 @@ sub get_script_config_dump
     delete $conf->{secret};
 
     if ($conf->{scm} eq 'git') {
-        chomp($conf->{farm}{revision} = `git -C $Bin describe --tags --always --dirty=+`);
+        chomp($conf->{farm}{revision} = `cd $RealBin && git describe --tags --always --dirty=+`);
 	$conf->{farm}{cwd} = getcwd();
-	$conf->{farm}{bindir} = $Bin;
+	$conf->{farm}{bindir} = $RealBin;
+	$conf->{farm}{perl} = $^V;
     }
 
     $Data::Dumper::Sortkeys = 1;