summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-03-17 12:08:59 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2015-03-17 12:09:07 +0100
commit9987c66d7c3a1186acb5a32e92cd6846d71987a5 (patch)
tree8abb8e180cbfee9088ef640b413968f32e29325a
parent83afcd174cdbf4fb770371da764f91ca9ad414a7 (diff)
downloadhaskell-9987c66d7c3a1186acb5a32e92cd6846d71987a5.tar.gz
Fix Windows testsuite driver
This got broken in commit 5258566.
-rw-r--r--testsuite/driver/testlib.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 59230abbc6..961f54565f 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -2272,17 +2272,17 @@ def printFailingTestInfosSummary(file, testInfos):
' (' + ','.join(testInfos[directory][test][reason]) + ')\n')
file.write('\n')
-def getStdout(cmd):
+def getStdout(cmd_and_args):
if have_subprocess:
- p = subprocess.Popen(strip_quotes(cmd),
+ p = subprocess.Popen([strip_quotes(cmd_and_args[0])] + cmd_and_args[1:],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(stdout, stderr) = p.communicate()
r = p.wait()
if r != 0:
- raise Exception("Command failed: " + str(cmd))
+ raise Exception("Command failed: " + str(cmd_and_args))
if stderr != '':
- raise Exception("stderr from command: " + str(cmd))
+ raise Exception("stderr from command: " + str(cmd_and_args))
return stdout
else:
raise Exception("Need subprocess to get stdout, but don't have it")