Prepend contents of failure log file in test suite output

[buildfarm-client.git] / run_build.pl

diff --git a/run_build.pl b/run_build.pl
index 3ceb33114828ddb362b763eab384a77785d0bf05..d95f64527163ce637cbcd30393c9135c8fe96e09 100755 (executable)
--- a/run_build.pl
+++ b/run_build.pl
@@ -999,6 +999,15 @@ sub make_test
                   ./runtest \$WORKDIR/$exim/src/build-*/exim -CONTINUE $tests_range )2>&1`;
       $status = $? >>8;
       push @makeout, @tmp;
+      # Prepend the failed summary log outputs for ease of reading
+      my $fail_summary = "$exim/test/failed-summary.log";
+      if (-f $fail_summary)
+      {
+        @tmp = `cat $fail_summary`;
+        push @tmp, "\n";
+        unshift @makeout, @tmp;
+        unshift @makeout, "Summary of failed tests:\n";
+      }
     }
     writelog('test',\@makeout);
     print "======== make test logs ===========\n",@makeout
@@ -1138,6 +1147,9 @@ sub configure
                           @tmp;
         push @config_opts, grep s/^(?:EXIM_)(PERL|PYTHON)=.*/$1/,
                            @tmp;
+        # OpenSSL doesn't have a specific USE flag
+        push @config_opts, grep s/^(TLS_LIBS.*-l(ssl|crypto)).*/OPENSSL/,
+                           @tmp;
         $EximBuild::conf{config_opts} = \@config_opts;
         
         # Does not matter what the Exim version is, as long as it is valid.