[PATCH] D16121: [test-suite] Fix exception caused by r256471.

Chad Rosier via llvm-commits llvm-commits at lists.llvm.org
Tue Jan 12 11:52:24 PST 2016


mcrosier created this revision.
mcrosier added reviewers: delcypher, MatzeB.
mcrosier added a subscriber: llvm-commits.

In r256471, support for per-test timeouts was added, which changed executeScript and executeScriptInternal to return four parameters instead of three.  This change is causing scripting in the test-suite to raise an exception when it didn't accept the correct returns.  This patch modifies lit.cfg to unpack the four values, though nothing is done with the timeout info, to fix the exception.

 Chad

http://reviews.llvm.org/D16121

Files:
  lit.cfg

Index: lit.cfg
===================================================================
--- lit.cfg
+++ lit.cfg
@@ -189,7 +189,7 @@
 
             output += "\n" + "\n".join(runscript)
 
-            out, err, exitCode = res
+            out, err, exitCode, timeoutInfo = res
             if exitCode == Test.FAIL:
                 # Only show command output in case of errors
                 output += "\n" + out
@@ -208,7 +208,7 @@
             res = runScript(test, litConfig, verifyscript, tmpBase)
             if isinstance(res, lit.Test.Result):
                 return res
-            out, err, exitCode = res
+            out, err, exitCode, timeoutInfo= res
 
             output += "\n" + "\n".join(verifyscript)
             if exitCode != 0:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D16121.44656.patch
Type: text/x-patch
Size: 752 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160112/9aca1413/attachment.bin>


More information about the llvm-commits mailing list