[llvm] 853e611 - Follow up for "[lit] Include unexecuted tests in xUnit report"

[Julian Lettner via llvm-commits]

Author: Julian Lettner
Date: 2020-06-15T16:19:43-07:00
New Revision: 853e61142d3cf8f54f3c85363b8cdb0622bd308b

URL: https://github.com/llvm/llvm-project/commit/853e61142d3cf8f54f3c85363b8cdb0622bd308b
DIFF: https://github.com/llvm/llvm-project/commit/853e61142d3cf8f54f3c85363b8cdb0622bd308b.diff

LOG: Follow up for "[lit] Include unexecuted tests in xUnit report"

The extended test fails on bots that still run lit tests with Python 2.

https://reviews.llvm.org/D81316

Added: 
    

Modified: 
    llvm/utils/lit/tests/Inputs/xunit-output/dummy_format.py

Removed: 
    


################################################################################
diff  --git a/llvm/utils/lit/tests/Inputs/xunit-output/dummy_format.py b/llvm/utils/lit/tests/Inputs/xunit-output/dummy_format.py
index 94410d215d39..59e75eb6860c 100644
--- a/llvm/utils/lit/tests/Inputs/xunit-output/dummy_format.py
+++ b/llvm/utils/lit/tests/Inputs/xunit-output/dummy_format.py
@@ -23,9 +23,10 @@ def execute(self, test, lit_config):
         result = lit.Test.Result(getattr(lit.Test, result_code),
                                  result_output)
 
-        required_feature = cfg.get('global', 'required_feature', fallback=None)
-        if required_feature:
-            test.requires.append(required_feature)
+        if cfg.has_option('global', 'required_feature'):
+            required_feature = cfg.get('global', 'required_feature')
+            if required_feature:
+                test.requires.append(required_feature)
 
         # Load additional metrics.
         for key,value_str in cfg.items('results'):