aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Matthews <cmatthews5@apple.com>2018-05-31 23:40:11 +0000
committerChris Matthews <cmatthews5@apple.com>2018-05-31 23:40:11 +0000
commit29d859599c70dd1090a406cc360fb752747ead5e (patch)
tree8b790b30c542193889c1a3f07d725454becec813
parentf08422662c4bf5d17d184f089a20247ba44f5e3c (diff)
Make compatible with upstream lit
New lit now returns a 5 tuple. Lets not unpack directly anymore, so we can support both versions. git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@333710 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--litsupport/testplan.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/litsupport/testplan.py b/litsupport/testplan.py
index e5ba2da6..d4d619b6 100644
--- a/litsupport/testplan.py
+++ b/litsupport/testplan.py
@@ -69,7 +69,10 @@ def _executeScript(context, script, scriptBaseName, useExternalSh=True):
exitCode = 1
timeoutInfo = None
else:
- (out, err, exitCode, timeoutInfo) = res
+ out = res[0]
+ err = res[1]
+ exitCode = res[2]
+ timeoutInfo = res[3]
# Log script in test output
context.result_output += "\n" + "\n".join(script)