Skip to contentSkip to conversation

kunit: tool: fix display of make errors

PATCH In review Daniel Latypov 2 participants 2 messages Sep 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kunit: tool: fix display of make errors

CalledProcessError stores the output of the failed process as bytes, not a str.

So when we log it on build error, the make output is all crammed into one line with "\n" instead of actually printing new lines.

After this change, we get readable output with new lines, e.g.

Quoted 6 lines

CC lib/kunit/kunit-example-test.o
In file included from ../lib/kunit/test.c:9:
../include/kunit/test.h:22:1: error: unknown type name ‘invalid_type_that_causes_compile’

   22 | invalid_type_that_causes_compile errors;
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

make[3]: *** [../scripts/Makefile.build:283: lib/kunit/test.o] Error 1

Secondly, trying to concat exceptions to strings will fail with

Quoted 1 line

TypeError: can only concatenate str (not "OSError") to str

so fix this with an explicit cast to str.

---
 tools/testing/kunit/kunit_kernel.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/kunit/kunit_kernel.py +6 -6
index e20e2056cb38..0e19089f62f0 100644
@@ -36,9 +36,9 @@ class LinuxSourceTreeOperations(object):
 		try:
 			subprocess.check_output(['make', 'mrproper'], stderr=subprocess.STDOUT)
 		except OSError as e:
-			raise ConfigError('Could not call make command: ' + e)
+			raise ConfigError('Could not call make command: ' + str(e))
 		except subprocess.CalledProcessError as e:
-			raise ConfigError(e.output)
+			raise ConfigError(e.output.decode())
 
 	def make_olddefconfig(self, build_dir, make_options):
 		command = ['make', 'ARCH=um', 'olddefconfig']
@@ -49,9 +49,9 @@ class LinuxSourceTreeOperations(object):
 		try:
 			subprocess.check_output(command, stderr=subprocess.STDOUT)
 		except OSError as e:
-			raise ConfigError('Could not call make command: ' + e)
+			raise ConfigError('Could not call make command: ' + str(e))
 		except subprocess.CalledProcessError as e:
-			raise ConfigError(e.output)
+			raise ConfigError(e.output.decode())
 
 	def make_allyesconfig(self):
 		kunit_parser.print_with_timestamp(
@@ -79,9 +79,9 @@ class LinuxSourceTreeOperations(object):
 		try:
 			subprocess.check_output(command, stderr=subprocess.STDOUT)
 		except OSError as e:
-			raise BuildError('Could not call execute make: ' + e)
+			raise BuildError('Could not call execute make: ' + str(e))
 		except subprocess.CalledProcessError as e:
-			raise BuildError(e.output)
+			raise BuildError(e.output.decode())
 
 	def linux_bin(self, params, timeout, build_dir, outfile):
 		"""Runs the Linux UML binary. Must be named 'linux'."""

base-commit: ccc1d052eff9f3cfe59d201263903fe1d46c79a5

Signature · 1 line
2.28.0.709.gb0816b6eb0-goog
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 15 lines · Daniel Latypov

CalledProcessError stores the output of the failed process as bytes, not a str.

So when we log it on build error, the make output is all crammed into one line with "\n" instead of actually printing new lines.

After this change, we get readable output with new lines, e.g.

Quoted 6 lines

CC lib/kunit/kunit-example-test.o
In file included from ../lib/kunit/test.c:9:
../include/kunit/test.h:22:1: error: unknown type name ‘invalid_type_that_causes_compile’

   22 | invalid_type_that_causes_compile errors;
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

make[3]: *** [../scripts/Makefile.build:283: lib/kunit/test.o] Error 1

Quoted 5 lines

Secondly, trying to concat exceptions to strings will fail with

Quoted 1 line

TypeError: can only concatenate str (not "OSError") to str

so fix this with an explicit cast to str.

Cheers!