Revert names back

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 7924b860f35b6f6e09adba86719729c77bdbe5f5..2061856fe0a959ef5f3a9542990ef21f23d9da93 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -167,8 +167,8 @@ my $branch;
 
     optional_steps =>{
         # which optional steps to run and when to run them
 
     optional_steps =>{
         # which optional steps to run and when to run them

-        # build_docs => {min_hours_since => 24*7},
-        make_test  => {min_hours_since => 24*7},
+        # make-doc => {min_hours_since => 24*7},
+        test  => {min_hours_since => 24*7},

     },
 
     # locales to test
     },
 
     # locales to test

diff --git a/run_build.pl b/run_build.pl
index be324687d8f85aef9053ff429d376999b7173001..bc15dd004a440bf798cb8e3702715c7647db3df8 100755 (executable)
--- a/run_build.pl
+++ b/run_build.pl
@@ -661,9 +661,9 @@ make();
 
 display_features();
 
 
 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');
 
 
 ##check_port_is_ok($buildport,'Post');
 


@@ -851,14 +851,14 @@ sub make
 
 sub make_doc
 {
 
 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;
     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";
     print "======== make doc log ===========\n",@makeout if ($verbose > 1);
     send_result('Doc',$status,\@makeout) if $status;
     $steps_completed .= " Doc";


@@ -996,7 +996,7 @@ sub make_isolation_check
 
 sub make_test
 {
 
 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;
     print time_str(),"running make test ...\n" if $verbose;
     my $tests_range = $EximBuild::conf{range_num_tests} || "1 4";
     my @makeout;


@@ -1020,7 +1020,7 @@ sub make_test
         unshift @makeout, "Summary of failed tests:\n";
       }
     }
         unshift @makeout, "Summary of failed tests:\n";
       }
     }

-    writelog('make_test',\@makeout);
+    writelog('test',\@makeout);

     print "======== make test logs ===========\n",@makeout
       if ($verbose > 1);
 
     print "======== make test logs ===========\n",@makeout
       if ($verbose > 1);