[commit: ghc] ghc-7.10: Fix Windows testsuite driver (67c3062)

git at git.haskell.org git at git.haskell.org
Tue Mar 17 16:22:51 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/67c30624cd1561f3aa8ac8c33075a20ff70d34fb/ghc

>---------------------------------------------------------------

commit 67c30624cd1561f3aa8ac8c33075a20ff70d34fb
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Mar 17 12:08:59 2015 +0100

    Fix Windows testsuite driver
    
    This got broken in commit 5258566.
    
    (cherry picked from commit 9987c66d7c3a1186acb5a32e92cd6846d71987a5)


>---------------------------------------------------------------

67c30624cd1561f3aa8ac8c33075a20ff70d34fb
 testsuite/driver/testlib.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 58375c1..653796b 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -2257,17 +2257,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")



More information about the ghc-commits mailing list