Commit 5a9fcad7 authored by Will Chen's avatar Will Chen Committed by Shuah Khan

kunit: capture stderr on all make subprocess calls

Direct stderr to subprocess.STDOUT so error messages get included in the
subprocess.CalledProcessError exceptions output field. This results in
more meaningful error messages for the user.

This is already being done in the make_allyesconfig method. Do the same
for make_mrproper, make_olddefconfig, and make methods.

With this, failures on unclean trees [1] will give users an error
message that includes:
"The source tree is not clean, please run 'make ARCH=um mrproper'"

[1] https://bugzilla.kernel.org/show_bug.cgi?id=205219Signed-off-by: default avatarWill Chen <chenwi@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Tested-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 39f65da0
...@@ -34,7 +34,7 @@ class LinuxSourceTreeOperations(object): ...@@ -34,7 +34,7 @@ class LinuxSourceTreeOperations(object):
def make_mrproper(self): def make_mrproper(self):
try: try:
subprocess.check_output(['make', 'mrproper']) subprocess.check_output(['make', 'mrproper'], stderr=subprocess.STDOUT)
except OSError as e: except OSError as e:
raise ConfigError('Could not call make command: ' + e) raise ConfigError('Could not call make command: ' + e)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
...@@ -47,7 +47,7 @@ class LinuxSourceTreeOperations(object): ...@@ -47,7 +47,7 @@ class LinuxSourceTreeOperations(object):
if build_dir: if build_dir:
command += ['O=' + build_dir] command += ['O=' + build_dir]
try: try:
subprocess.check_output(command, stderr=subprocess.PIPE) subprocess.check_output(command, stderr=subprocess.STDOUT)
except OSError as e: except OSError as e:
raise ConfigError('Could not call make command: ' + e) raise ConfigError('Could not call make command: ' + e)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
...@@ -77,7 +77,7 @@ class LinuxSourceTreeOperations(object): ...@@ -77,7 +77,7 @@ class LinuxSourceTreeOperations(object):
if build_dir: if build_dir:
command += ['O=' + build_dir] command += ['O=' + build_dir]
try: try:
subprocess.check_output(command) subprocess.check_output(command, stderr=subprocess.STDOUT)
except OSError as e: except OSError as e:
raise BuildError('Could not call execute make: ' + e) raise BuildError('Could not call execute make: ' + e)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
......
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