Expand uses of python 2.6's "A if B else C" syntax into regular

if-else statements, to hopefully support older pythons (PR7850).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110638 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index 9776784a16313d6b1509c31a888c392196a6d7e5..0eb51a829408544112dbd9f9b8e3966038918d67 100644 (file)
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -520,10 +520,16 @@ def executeTclTest(test, litConfig):
     out,err,exitCode = res
     if isXFail:
         ok = exitCode != 0 or err
-        status = Test.XFAIL if ok else Test.XPASS
+        if ok:
+            status = Test.XFAIL
+        else:
+            status = Test.XPASS
     else:
         ok = exitCode == 0 and not err
-        status = Test.PASS if ok else Test.FAIL
+        if ok:
+            status = Test.PASS
+        else:
+            status = Test.FAIL
 
     if ok:
         return (status,'')
@@ -560,10 +566,16 @@ def executeShTest(test, litConfig, useExternalSh):
     out,err,exitCode = res
     if isXFail:
         ok = exitCode != 0
-        status = Test.XFAIL if ok else Test.XPASS
+        if ok:
+            status = Test.XFAIL
+        else:
+            status = Test.XPASS
     else:
         ok = exitCode == 0
-        status = Test.PASS if ok else Test.FAIL
+        if ok:
+            status = Test.PASS
+        else:
+            status = Test.FAIL
 
     if ok:
         return (status,'')