Don't redirect stderr to stdout by default when calling setup.py

Change-Id: I49b7491be9649979f9f9487e983bdc4be355de07
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

2 files changed, 8 insertions, 3 deletions

diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py
index a1526793e..709b4b25c 100644
--- a/build_scripts/setup_runner.py
+++ b/build_scripts/setup_runner.py
@@ -146,7 +146,7 @@ class SetupRunner(object):
         for cmd in self.invocations_list:
             cmd_as_string = " ".join(cmd)
             print("\nRunning process: {}\n".format(cmd_as_string))
-            exit_code = run_process(cmd)
+            exit_code = run_process(cmd, redirect_stderr_to_stdout=False)
             if exit_code != 0:
                 msg = textwrap.dedent("""
                     setup.py invocation failed with exit code: {}.\n\n
diff --git a/build_scripts/utils.py b/build_scripts/utils.py
index 31d45af31..5c5f4927d 100644
--- a/build_scripts/utils.py
+++ b/build_scripts/utils.py
@@ -399,7 +399,7 @@ def run_process_output(args, initial_env=None):
         result.append(line.rstrip())
     return result
 
-def run_process(args, initial_env=None):
+def run_process(args, initial_env=None, redirect_stderr_to_stdout=True):
     """
     Run process until completion and return the process exit code.
     Prints both stdout and stderr to the console.
@@ -413,7 +413,12 @@ def run_process(args, initial_env=None):
     if initial_env is None:
         initial_env = os.environ
 
-    exit_code = subprocess.call(args, stderr=subprocess.STDOUT, env=initial_env)
+    kwargs = {}
+    kwargs['env'] = initial_env
+    if redirect_stderr_to_stdout:
+        kwargs['stderr'] = subprocess.STDOUT
+
+    exit_code = subprocess.call(args, **kwargs)
     return exit_code