From 650527c308aa9f82014b5c3724ab9cdce3e6367a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 27 Oct 2018 17:11:56 +0100 Subject: [PATCH 1/1] Support tuning the test "runtest" commandline --- build-farm.conf.template | 7 +++++-- run_build | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build-farm.conf.template b/build-farm.conf.template index 9aed6b6..223db7a 100644 --- a/build-farm.conf.template +++ b/build-farm.conf.template @@ -221,8 +221,11 @@ our %conf =( ], # 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') diff --git a/run_build b/run_build index 2d2b1ef..292de22 100755 --- 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}; + $EximBuild::conf{test_run_args} = "" unless exists $EximBuild::conf{test_run_args}; my @makeout; my %saved_env = %ENV; @@ -1057,7 +1058,7 @@ sub make_test 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 -- 2.30.2