Commit 9987c66d authored by thomie's avatar thomie
Browse files

Fix Windows testsuite driver

This got broken in commit 5258566e.
parent 83afcd17
......@@ -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")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment