Merge HA IceStorm branch.

- http://bugzilla/bugzilla/show_bug.cgi?id=2706
- http://bugzilla/bugzilla/show_bug.cgi?id=2705

1 files changed, 3 insertions, 3 deletions

diff --git a/config/TestUtil.py b/config/TestUtil.py
index 4a23459965c..09d776e539e 100755
--- a/config/TestUtil.py
+++ b/config/TestUtil.py
@@ -1069,21 +1069,21 @@ def startClient(exe, args, config=None, env=getTestEnv()):
         tmpini.write("extension=%s\n" % phpExtension)
         tmpini.close()
 
-    return os.popen(getCommandLine(exe, config, env) + args)
+    return os.popen(getCommandLine(exe, config, env) + args + " 2>&1")
 
 def startServer(exe, args, config=None, env=getTestEnv()):
     if config == None:
         config = DriverConfig("server")
     if debug:
         print "(" + getCommandLine(exe, config, env) + args + ")",
-    return os.popen(getCommandLine(exe, config, env) + args)
+    return os.popen(getCommandLine(exe, config, env) + args + " 2>&1")
 
 def startColloc(exe, args, config=None, env=getTestEnv()):
     if config == None:
         config = DriverConfig("colloc")
     if debug:
         print "(" + getCommandLine(exe, config, env) + args + ")",
-    return os.popen(getCommandLine(exe, config, env) + args)
+    return os.popen(getCommandLine(exe, config, env) + args + " 2>&1")
 
 def getMappingDir(currentDir):
     return os.path.abspath(os.path.join(findTopLevel(), getDefaultMapping(currentDir)))