[PATCH] D33579: Return a lit.Test.Result object from TestRunner's executeShTest()

[Dimitry Andric via Phabricator via llvm-commits]

dim created this revision.
Herald added a reviewer: modocache.

For various clang analyzer tests, which were unsupported, I got lit
exceptions, similar to the following:

  Exception during script execution:
  Traceback (most recent call last):
    File "utils/lit/lit/run.py", line 190, in execute_test
      result = test.config.test_format.execute(test, lit_config)
    File "tools/clang/test/Analysis/analyzer_test.py", line 11, in execute
      if result.code == lit.Test.FAIL:
  AttributeError: 'tuple' object has no attribute 'code'

This is because executeShTest() in utils/lit/lit/TestRunner.py is
supposed to return a lit.Test.Result object, but in case of unsupported
tests, it returns a plain tuple.

Fix this by returning a properly initialized lit.Test.Result object
instead.


https://reviews.llvm.org/D33579

Files:
  utils/lit/lit/TestRunner.py


Index: utils/lit/lit/TestRunner.py
===================================================================
--- utils/lit/lit/TestRunner.py
+++ utils/lit/lit/TestRunner.py
@@ -1056,7 +1056,7 @@
 def executeShTest(test, litConfig, useExternalSh,
                   extra_substitutions=[]):
     if test.config.unsupported:
-        return (Test.UNSUPPORTED, 'Test is unsupported')
+        return lit.Test.Result(Test.UNSUPPORTED, 'Test is unsupported')
 
     script = parseIntegratedTestScript(test)
     if isinstance(script, lit.Test.Result):


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D33579.100340.patch
Type: text/x-patch
Size: 541 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170525/fb4cf89d/attachment.bin>