Skip to content

Commit 65a4e52

Browse files
sulixshuahkh
authored andcommitted
kunit: tool: Force the use of the 'tty' console for UML
kunit_tool relies on the UML console outputting printk() output to the tty in order to get results. Since the default console driver could change, pass 'console=tty' to the kernel. This is triggered by a change[1] to use ttynull as a fallback console driver which -- by chance or by design -- seems to have changed the default console output on UML, breaking kunit_tool. While this may be fixed, we should be less fragile to such changes in the default. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=757055ae8dedf5333af17b3b5b4b70ba9bc9da4e Signed-off-by: David Gow <davidgow@google.com> Fixes: 757055a ("init/console: Use ttynull as a fallback when there is no console") Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Brendan Higgins <brendanhiggins@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
1 parent e71ba94 commit 65a4e52

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/testing/kunit/kunit_kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def build_um_kernel(self, alltests, jobs, build_dir, make_options):
198198
return self.validate_config(build_dir)
199199

200200
def run_kernel(self, args=[], build_dir='', timeout=None):
201-
args.extend(['mem=1G'])
201+
args.extend(['mem=1G', 'console=tty'])
202202
self._ops.linux_bin(args, timeout, build_dir)
203203
outfile = get_outfile_path(build_dir)
204204
subprocess.call(['stty', 'sane'])

0 commit comments

Comments
 (0)