[Lldb-commits] [lldb] r351497 - [lit] Fix lldbtest format

[Jonas Devlieghere via lldb-commits]

Author: jdevlieghere
Date: Thu Jan 17 15:30:06 2019
New Revision: 351497

URL: http://llvm.org/viewvc/llvm-project?rev=351497&view=rev
Log:
[lit] Fix lldbtest format

The lldbtest format was incorrectly detecting XFAIL as FAIL because it
was looking for the `FAIL:` substring in the dotest output.

Modified:
    lldb/trunk/lit/Suite/lldbtest.py

Modified: lldb/trunk/lit/Suite/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Suite/lldbtest.py?rev=351497&r1=351496&r2=351497&view=diff
==============================================================================
--- lldb/trunk/lit/Suite/lldbtest.py (original)
+++ lldb/trunk/lit/Suite/lldbtest.py Thu Jan 17 15:30:06 2019
@@ -94,8 +94,11 @@ class LLDBTest(TestFormat):
                 litConfig.maxIndividualTestTime))
 
         if exitCode:
-            if 'FAIL:' in out or 'FAIL:' in err:
-                return lit.Test.FAIL, out + err
+            # Match FAIL but not XFAIL.
+            for line in out.splitlines() + err.splitlines():
+                if line.startswith('FAIL:'):
+                    return lit.Test.FAIL, out + err
+
             if 'XPASS:' in out or 'XPASS:' in err:
                 return lit.Test.XPASS, out + err