From 7c2ec520b39d6834515f09b11c317fdd86c150e6 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 27 Oct 2018 17:11:56 +0100 Subject: [PATCH] Support tuning the test "runtest" commandline (cherry picked from commit 650527c308aa9f82014b5c3724ab9cdce3e6367a) --- build-farm.conf.template | 3 +++ run_build | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build-farm.conf.template b/build-farm.conf.template index 9e4e76e..6bd1d4d 100644 --- 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 => [], + # 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 6290e0c..ec29af1 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, $status); { @@ -1059,7 +1060,7 @@ sub make_test 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