Support tuning the test "runtest" commandline

(cherry picked from commit 650527c308aa9f82014b5c3724ab9cdce3e6367a)

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 9e4e76ef97c398cca8c6a27e1bfc358cef700b93..6bd1d4d3448151e1d1e6a8c03d3483f0f60de61c 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -226,6 +226,9 @@ our %conf =(
     # test_configure_args => [ '--foo', '--bar' => 3, '-v' ]
     test_configure_env => {},
     test_configure_args => [],
     # test_configure_args => [ '--foo', '--bar' => 3, '-v' ]
     test_configure_env => {},
     test_configure_args => [],

+    # Configuration tuning for test suite run
+    # eg. test_run_args = '-FLAVOUR openssl_1_1_1',
+    test_run_args => '',       

 );
 
 if ($branch eq 'global')
 );
 
 if ($branch eq 'global')

diff --git a/run_build b/run_build
index 6290e0c9c5e2141c010ffb5e12db7addc25b78bf..ec29af16f6df93dd6fa07f7a26d835ac20f96230 100755 (executable)
--- a/run_build
+++ b/run_build
@@ -1040,6 +1040,7 @@ sub make_test
     # backwards compat for build-farm.conf from before this support was added
     $EximBuild::conf{test_configure_env} = {} unless exists $EximBuild::conf{test_configure_env};
     $EximBuild::conf{test_configure_args} = [] unless exists $EximBuild::conf{test_configure_args};
     # backwards compat for build-farm.conf from before this support was added
     $EximBuild::conf{test_configure_env} = {} unless exists $EximBuild::conf{test_configure_env};
     $EximBuild::conf{test_configure_args} = [] unless exists $EximBuild::conf{test_configure_args};

+    $EximBuild::conf{test_run_args} = "" unless exists $EximBuild::conf{test_run_args};

 
     my (@makeout, $status);
     {
 
     my (@makeout, $status);
     {


@@ -1059,7 +1060,7 @@ sub make_test
 
     unless($status)
     {
 
     unless($status)
     {

-      my @tmp = `(cd $exim/test && ./runtest -CONTINUE $tests_range )2>&1`;
+      my @tmp = `(cd $exim/test && ./runtest -CONTINUE $EximBuild::conf{test_run_args} $tests_range )2>&1`;

       $status = $? >>8;
       push @makeout, @tmp;
       # Prepend the failed summary log outputs for ease of reading
       $status = $? >>8;
       push @makeout, @tmp;
       # Prepend the failed summary log outputs for ease of reading