diff options
author | Dan Liew <dan@su-root.co.uk> | 2018-04-20 10:11:41 +0000 |
---|---|---|
committer | Dan Liew <dan@su-root.co.uk> | 2018-04-20 10:11:41 +0000 |
commit | 1ee7070ddf846d86185e6107369de199eeceb74a (patch) | |
tree | fb9ca3e91a591c556ef32ed97510697d07940a35 /utils/lit | |
parent | 113fa203569c5cc2313f9be006310926b93cb16a (diff) |
[lit] Fix a bug where UNRESOLVED tests were not handled in the XUnit
XML printer.
A test has been added that tries to comprehensively test emitting
XUnit XML output for shell tests.
Differential Revision: https://reviews.llvm.org/D45567
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@330409 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/lit')
-rw-r--r-- | utils/lit/lit/Test.py | 3 | ||||
-rw-r--r-- | utils/lit/tests/shtest-xunit-output.py | 78 |
2 files changed, 80 insertions, 1 deletions
diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py index 5368b8ba4d2..46b82488bde 100644 --- a/utils/lit/lit/Test.py +++ b/utils/lit/lit/Test.py @@ -373,7 +373,8 @@ class Test: xml = "<testcase classname='" + class_name + "' name='" + \ test_name + "'" - xml += " time='%.2f'" % (self.result.elapsed,) + xml += " time='{:.2f}'".format( + self.result.elapsed if self.result.elapsed is not None else 0.0) if self.result.code.isFailure: xml += ">\n\t<failure >\n" + escape(self.result.output) xml += "\n\t</failure>\n</testcase>" diff --git a/utils/lit/tests/shtest-xunit-output.py b/utils/lit/tests/shtest-xunit-output.py new file mode 100644 index 00000000000..853ed560e80 --- /dev/null +++ b/utils/lit/tests/shtest-xunit-output.py @@ -0,0 +1,78 @@ +# RUN: not %{lit} -j 1 -v %{inputs}/shtest-format - --xunit-xml-output %t.xml +# RUN: FileCheck < %t.xml %s + +# CHECK: <?xml version="1.0" encoding="UTF-8" ?> +# CHECK-NEXT: <testsuites> +# CHECK-NEXT: <testsuite name='shtest-format' tests='23' failures='7'> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='argv0.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.external_shell' name='fail.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + + +# CHECK: <testcase classname='shtest-format.external_shell' name='fail_with_bad_encoding.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + +# CHECK: <testcase classname='shtest-format.external_shell' name='pass.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='fail.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='no-test-line.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='pass.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-any-missing.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-any-present.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-missing.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-present.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-star.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + + +# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-triple.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='unsupported-expr-false.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='unsupported-expr-true.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='unsupported-star.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + +# CHECK: <testcase classname='shtest-format.unsupported_dir' name='some-test.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='xfail-expr-false.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='xfail-expr-true.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='xfail-feature.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='xfail-target.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='xfail.txt' time='{{[0-9]+\.[0-9]+}}'/> + +# CHECK: <testcase classname='shtest-format.shtest-format' name='xpass.txt' time='{{[0-9]+\.[0-9]+}}'> +# CHECK-NEXT: <failure{{[ ]*}}> +# CHECK: </failure> +# CHECK-NEXT: </testcase> + +# CHECK: </testsuite> +# CHECK-NEXT: </testsuites> |