From fb6ad2e403aa0a2949c7145996a521a4cdec9676 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@sergiodj.net>
Date: Thu, 2 Jun 2016 20:15:02 -0400
Subject: [PATCH] Improve XFAIL section in the email

---
 master.cfg | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/master.cfg b/master.cfg
index db59052..9f90561 100644
--- a/master.cfg
+++ b/master.cfg
@@ -355,21 +355,18 @@ send to the gdb-testers mailing list."""
     # Including the 'xfail' log.  It is important to say which tests
     # we are ignoring.
     if found_regressions:
-        # for log in build.getLogs ():
-        #     if log.getStep ().getName () == 'regressions' and log.getName () == 'baseline_diff':
-        #         text += "\n\n*** Regressions against the baseline ***\n"
-        #         text += "============================\n"
-        #         text += log.getText ()
-        #         text += "============================\n"
-        #         break
-
-        xfail = os.path.join (gdb_web_base, name, 'xfails', branch, 'xfail')
-        if os.path.exists (xfail):
-            text += "\n\n*** Complete list of XFAILs for this builder ***\n"
-            text += "============================\n"
-            with open (xfail, 'r') as f:
-                text += f.read ()
-            text += "============================\n"
+        xfail_commit = os.path.join (gdb_web_base, name, 'xfails', branch, '.last-commit')
+        text += "\n\n*** Complete list of XFAILs for this builder ***\n\n"
+        if os.path.exists (xfail_commit):
+            with open (xfail_commit, 'r') as f:
+                com = f.read ().strip ('\n')
+            text += "To obtain the list of XFAIL tests for this builder, go to:\n\n"
+            text += "\t<http://git.sergiodj.net/?p=gdb-xfails.git;a=blob;f=xfails/%s/xfails/%s/xfail;hb=%s>\n\n" % (name, branch, com)
+            text += "You can also see a pretty-printed version of the list, with more information\n"
+            text += "about each XFAIL, by going to:\n\n"
+            text += "\t<http://git.sergiodj.net/?p=gdb-xfails.git;a=blob;f=xfails/%s/xfails/%s/xfail.table;hb=%s>\n" % (name, branch, com)
+        else:
+            text += "FAILURE TO OBTAIN THE COMMIT FOR THE XFAIL LIST.  PLEASE CONTACT THE BUILDBOT ADMIN.\n"
     text += "\n"
 
     if report_build_breakage: