Skip to content

Commit 263da33

Browse files
committed
Merge tag 'linux-kselftest-kunit-fixes-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kunit fixes from Shuah Khan: "One fix to force the use of the 'tty' console for UML. Given that kunit tool requires the console output, explicitly stating the dependency makes sense than relying on it being the default" * tag 'linux-kselftest-kunit-fixes-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: kunit: tool: Force the use of the 'tty' console for UML
2 parents 8f3d849 + 65a4e52 commit 263da33

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)