[llvm] r332156 - Add the message attribute to skipped

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Fri May 11 16:15:11 2018
New Revision: 332156

URL: http://llvm.org/viewvc/llvm-project?rev=332156&view=rev
Log:
Add the message attribute to skipped

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

Modified:
    llvm/trunk/utils/lit/lit/Test.py
    llvm/trunk/utils/lit/tests/shtest-xunit-output.py

Modified: llvm/trunk/utils/lit/lit/Test.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/Test.py?rev=332156&r1=332155&r2=332156&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/Test.py (original)
+++ llvm/trunk/utils/lit/lit/Test.py Fri May 11 16:15:11 2018
@@ -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("/>")

Modified: llvm/trunk/utils/lit/tests/shtest-xunit-output.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shtest-xunit-output.py?rev=332156&r1=332155&r2=332156&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/shtest-xunit-output.py (original)
+++ llvm/trunk/utils/lit/tests/shtest-xunit-output.py Fri May 11 16:15:11 2018
@@ -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]+}}'/>