From 95fa7bc89ddd248023bbe54aa3d9ba4d9903a4c2 Mon Sep 17 00:00:00 2001
From: Rasmus Johansson <razze@iki.fi>
Date: Mon, 4 May 2020 10:10:07 +0000
Subject: [PATCH] MDEV-22273 jUnit patch: xml test result differs from MTR
 output in case if retry

---
 mysql-test/lib/mtr_report.pm | 11 +++++++----
 mysql-test/mysql-test-run.pl |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
index 6c65982bafa..0b99eafa4cf 100644
--- a/mysql-test/lib/mtr_report.pm
+++ b/mysql-test/lib/mtr_report.pm
@@ -472,12 +472,15 @@ sub mtr_report_stats ($$$$) {
       my $comment = $test->{'comment'};
       $comment =~ s/[\"]//g;
 
-      if ($test->{'result'} eq "MTR_RES_FAILED") {
-        $xml_report .= qq(>\n\t\t\t<failure message="" type="$test->{'result'}">\n<![CDATA[$test->{'logfile'}]]>\n\t\t\t</failure>\n\t\t</testcase>\n);
+      # if a test case has to be retried it should have the result MTR_RES_FAILED in jUnit XML
+      if ($test->{'result'} eq "MTR_RES_FAILED" || $test->{'retries'}) {
+        my $logcontents = $test->{'logfile-failed'} || $test->{'logfile'};
+
+        $xml_report .= qq(>\n\t\t\t<failure message="" type="MTR_RES_FAILED">\n<![CDATA[$logcontents]]>\n\t\t\t</failure>\n\t\t</testcase>\n);
       } elsif ($test->{'result'} eq "MTR_RES_SKIPPED" && $test->{'disable'}) {
-        $xml_report .= qq(>\n\t\t\t<disabled message="$comment" type="$test->{'result'}"/>\n\t\t</testcase>\n);
+        $xml_report .= qq(>\n\t\t\t<disabled message="$comment" type="MTR_RES_SKIPPED"/>\n\t\t</testcase>\n);
       } elsif ($test->{'result'} eq "MTR_RES_SKIPPED") {
-        $xml_report .= qq(>\n\t\t\t<skipped message="$comment" type="$test->{'result'}"/>\n\t\t</testcase>\n);
+        $xml_report .= qq(>\n\t\t\t<skipped message="$comment" type="MTR_RES_SKIPPED"/>\n\t\t</testcase>\n);
       } else {
         $xml_report .= " />\n";
       }
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 43e35bdab6d..2850aafa67a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -769,6 +769,7 @@ sub run_test_server ($$$) {
               if ( $result->is_failed() ) {
                 my $worker_logdir= $result->{savedir};
                 my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
+                $result->{'logfile-failed'} = mtr_lastlinesfromfile($log_file_name, 20);
                 rename $log_file_name,$log_file_name.".failed";
               }
 	      delete($result->{result});