Cleanup

[buildfarm-client.git] / run_build

diff --git a/run_build b/run_build
index 14842ab646cbf6dc3debb08c9d92b89635118937..a476bdbf7c675b8cb408df1486a6a529ac157507 100755 (executable)
--- a/run_build
+++ b/run_build
@@ -1037,14 +1037,11 @@ sub make_test
     print time_str(),"running make test ...\n" if $verbose;
     my $tests_range = $EximBuild::conf{range_num_tests} || "1 4";
     my @makeout;
-    @makeout =`(cd $exim/test
-                autoconf && ./configure && $make )2>&1 `;
+    @makeout =`(cd $exim/test && ./configure && $make )2>&1 `;
     my $status = $? >>8;
     unless($status)
     {
-      my @tmp = `(WORKDIR=\$PWD
-                  cd $exim/test
-                  ./runtest \$WORKDIR/$exim/src/build-*/exim -CONTINUE $tests_range )2>&1`;
+      my @tmp = `(cd $exim/test && ./runtest -CONTINUE $tests_range )2>&1`;
       $status = $? >>8;
       push @makeout, @tmp;
       # Prepend the failed summary log outputs for ease of reading
@@ -1169,7 +1166,8 @@ sub configure
         @tmp = `echo "Hardcoded Exim user info:"; id $exim_user
           cd $exim && perl -pi -e 's/^EXIM_USER=.*/EXIM_USER=$exim_user/' $local_conf`;
         push @confout, @tmp;
-        my $me = `whoami`; chomp $me;
+        #my $me = `whoami`; chomp $me;
+       my $me = getpwuid($>) // die "$0: getpwuid($>): $!\n";
         @tmp = `echo "Build Farm user info:"; id $me
           cd $exim && perl -pi -e 's/^# CONFIGURE_OWNER=\$/CONFIGURE_OWNER=$me/' $local_conf`;
         push @confout, @tmp;