Detect when git is not in the path

[buildfarm-client.git] / run_build.pl

diff --git a/run_build.pl b/run_build.pl
index be324687d8f85aef9053ff429d376999b7173001..2171231d95ae745851cbad97310fd7b779c4fb9f 100755 (executable)
--- a/run_build.pl
+++ b/run_build.pl
@@ -313,7 +313,8 @@ foreach my $oldfile (glob("last*"))
 
 my $branch_root = getcwd();
 
-# make sure we are using GNU make
+# Normally we would require GNU Make, but allow farm
+# configuration to override this
 die "$make is not GNU Make - please fix config file"
   unless check_make();
 
@@ -661,9 +662,9 @@ make();
 
 display_features();
 
-make_test() if (check_optional_step('make_test'));
+make_test() if (check_optional_step('test'));
 
-make_doc() if (check_optional_step('build_docs'));
+make_doc() if (check_optional_step('make-doc'));
 
 ##check_port_is_ok($buildport,'Post');
 
@@ -827,6 +828,12 @@ sub display_features
     
 sub check_make
 {
+    # Allow farm member to configure non-GNU make
+    my $non_gnu_make = $EximBuild::conf{non_gnu_make};
+    if (!defined $non_gnu_make ||
+        (defined $non_gnu_make && $non_gnu_make == 1)) {
+      return 'OK';
+    }
     my @out = `$make -v 2>&1`;
     return undef unless ($? == 0 && grep {/GNU Make/} @out);
     return 'OK';
@@ -851,14 +858,14 @@ sub make
 
 sub make_doc
 {
-    return unless step_wanted('build_docs');
+    return unless step_wanted('make-doc');
     print time_str(),"running make doc ...\n" if $verbose;
 
     my (@makeout);
     @makeout = `cd $exim/doc/doc-docbook/ && \
                 EXIM_VER="4.82" $make everything 2>&1`;
     my $status = $? >>8;
-    writelog('build_docs',\@makeout);
+    writelog('make-doc',\@makeout);
     print "======== make doc log ===========\n",@makeout if ($verbose > 1);
     send_result('Doc',$status,\@makeout) if $status;
     $steps_completed .= " Doc";
@@ -996,7 +1003,7 @@ sub make_isolation_check
 
 sub make_test
 {
-    return unless step_wanted('make_test');
+    return unless step_wanted('test');
     print time_str(),"running make test ...\n" if $verbose;
     my $tests_range = $EximBuild::conf{range_num_tests} || "1 4";
     my @makeout;
@@ -1020,7 +1027,7 @@ sub make_test
         unshift @makeout, "Summary of failed tests:\n";
       }
     }
-    writelog('make_test',\@makeout);
+    writelog('test',\@makeout);
     print "======== make test logs ===========\n",@makeout
       if ($verbose > 1);