[llvm] 201e73c - [lit] Small refinements for xunit report output

[Julian Lettner via llvm-commits]

Author: Julian Lettner
Date: 2020-05-01T17:03:55-07:00
New Revision: 201e73cbbb5056b93f6a3849852b0429a27b5672

URL: https://github.com/llvm/llvm-project/commit/201e73cbbb5056b93f6a3849852b0429a27b5672
DIFF: https://github.com/llvm/llvm-project/commit/201e73cbbb5056b93f6a3849852b0429a27b5672.diff

LOG: [lit] Small refinements for xunit report output

Added: 
    

Modified: 
    llvm/utils/lit/lit/reports.py
    llvm/utils/lit/tests/shtest-format.py
    llvm/utils/lit/tests/xunit-output.py

Removed: 
    


################################################################################
diff  --git a/llvm/utils/lit/lit/reports.py b/llvm/utils/lit/lit/reports.py
index d043e7f71fb4..de5a22d10016 100755
--- a/llvm/utils/lit/lit/reports.py
+++ b/llvm/utils/lit/lit/reports.py
@@ -76,7 +76,7 @@ def write_results(self, tests, elapsed):
         tests_by_suite = itertools.groupby(tests, lambda t: t.suite)
 
         with open(self.output_file, 'w') as file:
-            file.write('<?xml version="1.0" encoding="UTF-8" ?>\n')
+            file.write('<?xml version="1.0" encoding="UTF-8"?>\n')
             file.write('<testsuites>\n')
             for suite, test_iter in tests_by_suite:
                 self._write_testsuite(file, suite, list(test_iter))
@@ -100,7 +100,7 @@ def _write_test(self, file, test, suite_name):
         file.write(f'<testcase classname={quo(class_name)} name={quo(name)} time="{time:.2f}"')
 
         if test.isFailure():
-            file.write('>\n\t<failure ><![CDATA[')
+            file.write('>\n  <failure><![CDATA[')
             # In the unlikely case that the output contains the CDATA
             # terminator we wrap it by creating a new CDATA block.
             output = test.result.output.replace(']]>', ']]]]><![CDATA[>')
@@ -110,7 +110,7 @@ def _write_test(self, file, test, suite_name):
             file.write(']]></failure>\n</testcase>\n')
         elif test.result.code in self.skipped_codes:
             reason = self._get_skip_reason(test)
-            file.write(f'>\n\t<skipped message={quo(reason)} />\n</testcase>\n\n')
+            file.write(f'>\n  <skipped message={quo(reason)}/>\n</testcase>\n')
         else:
             file.write('/>\n')
 
@@ -124,5 +124,5 @@ def _get_skip_reason(self, test):
         assert code == lit.Test.UNSUPPORTED
         features = test.getMissingRequiredFeatures()
         if features:
-            return 'Skipping because of: ' + ', '.join(features)
-        return 'Skipping because of configuration.'
+            return 'Missing required feature(s): ' + ', '.join(features)
+        return 'Skipping because of configuration'

diff  --git a/llvm/utils/lit/tests/shtest-format.py b/llvm/utils/lit/tests/shtest-format.py
index 75d08895f966..c679b2987ca7 100644
--- a/llvm/utils/lit/tests/shtest-format.py
+++ b/llvm/utils/lit/tests/shtest-format.py
@@ -86,7 +86,7 @@
 # CHECK: Unexpected Passes  : 1
 
 
-# XUNIT: <?xml version="1.0" encoding="UTF-8" ?>
+# XUNIT: <?xml version="1.0" encoding="UTF-8"?>
 # XUNIT-NEXT: <testsuites>
 # XUNIT-NEXT: <testsuite name="shtest-format" tests="22" failures="7" skipped="4">
 
@@ -118,7 +118,7 @@
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="pass.txt" time="{{[0-9]+\.[0-9]+}}"/>
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-missing.txt" time="{{[0-9]+\.[0-9]+}}">
-# XUNIT-NEXT:<skipped message="Skipping because of: a-missing-feature" />
+# XUNIT-NEXT:<skipped message="Missing required feature(s): a-missing-feature"/>
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-present.txt" time="{{[0-9]+\.[0-9]+}}"/>
 
@@ -129,12 +129,12 @@
 
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-triple.txt" time="{{[0-9]+\.[0-9]+}}">
-# XUNIT-NEXT:<skipped message="Skipping because of: x86_64" />
+# XUNIT-NEXT:<skipped message="Missing required feature(s): x86_64"/>
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="unsupported-expr-false.txt" time="{{[0-9]+\.[0-9]+}}"/>
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="unsupported-expr-true.txt" time="{{[0-9]+\.[0-9]+}}">
-# XUNIT-NEXT:<skipped message="Skipping because of configuration." />
+# XUNIT-NEXT:<skipped message="Skipping because of configuration"/>
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="unsupported-star.txt" time="{{[0-9]+\.[0-9]+}}">
 # XUNIT-NEXT: <failure{{[ ]*}}>
@@ -142,7 +142,7 @@
 # XUNIT-NEXT: </testcase>
 
 # XUNIT: <testcase classname="shtest-format.unsupported_dir" name="some-test.txt" time="{{[0-9]+\.[0-9]+}}">
-# XUNIT-NEXT:<skipped message="Skipping because of configuration." />
+# XUNIT-NEXT:<skipped message="Skipping because of configuration"/>
 
 # XUNIT: <testcase classname="shtest-format.shtest-format" name="xfail-expr-false.txt" time="{{[0-9]+\.[0-9]+}}"/>
 

diff  --git a/llvm/utils/lit/tests/xunit-output.py b/llvm/utils/lit/tests/xunit-output.py
index 930768e61dae..9cfe2cb9aa68 100644
--- a/llvm/utils/lit/tests/xunit-output.py
+++ b/llvm/utils/lit/tests/xunit-output.py
@@ -7,10 +7,10 @@
 # RUN: sh -c 'if command -v xmllint 2>/dev/null; then xmllint --noout %t.xunit.xml; fi'
 # RUN: FileCheck < %t.xunit.xml %s
 
-# CHECK: <?xml version="1.0" encoding="UTF-8" ?>
+# CHECK: <?xml version="1.0" encoding="UTF-8"?>
 # CHECK: <testsuites>
 # CHECK: <testsuite name="test-data" tests="1" failures="1" skipped="0">
 # CHECK: <testcase classname="test-data.test-data" name="bad&name.ini" time="{{[0-1]}}.{{[0-9]+}}">
-# CHECK-NEXT: <failure ><![CDATA[& < > ]]]]><![CDATA[> &"]]></failure>
+# CHECK-NEXT: <failure><![CDATA[& < > ]]]]><![CDATA[> &"]]></failure>
 # CHECK: </testsuite>
 # CHECK: </testsuites>