{
return unless step_wanted('test');
print time_str(),"running make test ...\n" if $verbose;
+
my $tests_range = $EximBuild::conf{range_num_tests} || "1 4";
+ # 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;
- @makeout =`(cd $exim/test
- autoconf && ./configure && $make )2>&1 `;
+ my %saved_env = %ENV;
+ foreach my $k (keys %{$EximBuild::conf{test_configure_env}}) {
+ $ENV{$k} = $EximBuild::conf{test_configure_env}{$k};
+ }
+ my $conf_args = '';
+ foreach (@{$EximBuild::conf{test_configure_args}}) {
+ s/'/'"'"'/g;
+ $conf_args .= " '${_}'";
+ }
+ @makeout =`(cd $exim/test && ./configure $conf_args && $make )2>&1 `;
+ %ENV = %saved_env;
+
my $status = $? >>8;
unless($status)
{
- my @tmp = `(WORKDIR=\$PWD
- cd $exim/test
- ./runtest \$WORKDIR/$exim/src/build-*/exim -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
}
}
writelog('test',\@makeout);
- print "======== make test logs ===========\n",@makeout
- if ($verbose > 1);
-
send_result('Test',$status,\@makeout) if $status;
@makeout = `cat $exim/test/run-summary.log`;
- send_result('Test-results',$status,\@makeout) if $status;
+ writelog('test-results',\@makeout);
+ print "======== make test logs ===========\n",@makeout
+ if ($verbose > 1);
$steps_completed .= " Test";
}
@tmp = `echo "Hardcoded Exim user info:"; id $exim_user
cd $exim && perl -pi -e 's/^EXIM_USER=.*/EXIM_USER=$exim_user/' $local_conf`;
push @confout, @tmp;
- my $me = `whoami`; chomp $me;
+ #my $me = `whoami`; chomp $me;
+ my $me = getpwuid($>) // die "$0: getpwuid($>): $!\n";
@tmp = `echo "Build Farm user info:"; id $me
cd $exim && perl -pi -e 's/^# CONFIGURE_OWNER=\$/CONFIGURE_OWNER=$me/' $local_conf`;
push @confout, @tmp;
push @confout, @tmp;
# Build the config_opts array to send to the server
chomp @tmp;
- my @config_opts = grep s/(?:LOOKUP_|EXPERIMENTAL_|USE_)(\S+)=.*/$1/,
+ my @config_opts = grep s/(?:LOOKUP_|EXPERIMENTAL_|SUPPORT_|USE_)(\S+)=.*/$1/,
@tmp;
push @config_opts, grep s/^(?:EXIM_)(PERL|PYTHON)=.*/$1/,
@tmp;