RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Add the message attribute to skipped

Browse Source 
JUnit xml allows for a message attribute to be displayed on skips. Lets
populate that with an analysis of why we skipped the test.

llvm-svn: 332156
This commit is contained in:
Chris Matthews 2018-05-11 23:15:11 +00:00
parent 7858faaa20
commit 5e42577a9e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/lit/lit/Test.py
View File

@ -384,6 +384,12 @@ class Test:
fil.write(encoded_output)
fil.write("]]></failure>\n</testcase>")
elif self.result.code == UNSUPPORTED:
fil.write(">\n\t<skipped />\n</testcase>\n")
unsupported_features = self.getMissingRequiredFeatures()
if unsupported_features:
skip_message = "Skipping because of: " + ", ".join(unsupported_features)
else:
skip_message = "Skipping because of configuration."
fil.write(">\n\t<skipped message=\"{}\" />\n</testcase>\n".format(skip_message))
else:
fil.write("/>")

10
utils/lit/tests/shtest-xunit-output.py
View File

@ -33,12 +33,12 @@
# 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-NEXT:<skipped />
# CHECK-NEXT:<skipped message="Skipping because of: a-missing-feature || a-missing-feature-2" />
# 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-NEXT:<skipped />
# CHECK-NEXT:<skipped message="Skipping because of: a-missing-feature" />
# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-present.txt' time='{{[0-9]+\.[0-9]+}}'/>
@ -49,12 +49,12 @@
# CHECK: <testcase classname='shtest-format.shtest-format' name='requires-triple.txt' time='{{[0-9]+\.[0-9]+}}'>
# CHECK-NEXT:<skipped />
# CHECK-NEXT:<skipped message="Skipping because of: x86_64" />
# 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-NEXT:<skipped />
# CHECK-NEXT:<skipped message="Skipping because of configuration." />
# CHECK: <testcase classname='shtest-format.shtest-format' name='unsupported-star.txt' time='{{[0-9]+\.[0-9]+}}'>
# CHECK-NEXT: <failure{{[ ]*}}>
@ -62,7 +62,7 @@
# CHECK-NEXT: </testcase>
# CHECK: <testcase classname='shtest-format.unsupported_dir' name='some-test.txt' time='{{[0-9]+\.[0-9]+}}'>
# CHECK-NEXT:<skipped />
# CHECK-NEXT:<skipped message="Skipping because of configuration." />
# CHECK: <testcase classname='shtest-format.shtest-format' name='xfail-expr-false.txt' time='{{[0-9]+\.[0-9]+}}'/>