print time_str(),"running make test ...\n" if $verbose;
my $tests_range = $EximBuild::conf{range_num_tests} || "1 4";
my @makeout;
- @makeout =`(cd $exim/test
- autoconf && ./configure && $make )2>&1 `;
+ @makeout =`(cd $exim/test && ./configure && $make )2>&1 `;
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 $tests_range )2>&1`;
$status = $? >>8;
push @makeout, @tmp;
# Prepend the failed summary log outputs for ease of reading
@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;