Support tuning the test "runtest" commandline

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 9aed6b642eba02ffb7264242e798e2a7aba5417e..223db7aa87880a940eb0d79e66049bdf84f7c336 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -221,8 +221,11 @@ our %conf =(
     ],
 
     # Configuration tuning for test suite ./configure
     ],
 
     # Configuration tuning for test suite ./configure

-    test_configure_env =>{},
-    test_configure_args =>[],
+    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 2d2b1ef30de02f2a7286e2e9268af8dc4a9cead4..292de22e66c554206fd733dd7893c9c329f18a5a 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;
     my %saved_env = %ENV;
 
     my @makeout;
     my %saved_env = %ENV;


@@ -1057,7 +1058,7 @@ sub make_test
     my $status = $? >>8;
     unless($status)
     {
     my $status = $? >>8;
     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