Commit 5578d008 authored by Brendan Higgins's avatar Brendan Higgins Committed by Shuah Khan

kunit: tool: fix running kunit_tool from outside kernel tree

Currently kunit_tool does not work correctly when executed from a path
outside of the kernel tree, so make sure that the current working
directory is correct and the kunit_dir is properly initialized before
running.
Signed-off-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 9123e3a7
...@@ -237,9 +237,13 @@ def main(argv, linux=None): ...@@ -237,9 +237,13 @@ def main(argv, linux=None):
cli_args = parser.parse_args(argv) cli_args = parser.parse_args(argv)
if get_kernel_root_path():
os.chdir(get_kernel_root_path())
if cli_args.subcommand == 'run': if cli_args.subcommand == 'run':
if not os.path.exists(cli_args.build_dir): if not os.path.exists(cli_args.build_dir):
os.mkdir(cli_args.build_dir) os.mkdir(cli_args.build_dir)
create_default_kunitconfig()
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
...@@ -257,6 +261,7 @@ def main(argv, linux=None): ...@@ -257,6 +261,7 @@ def main(argv, linux=None):
if cli_args.build_dir: if cli_args.build_dir:
if not os.path.exists(cli_args.build_dir): if not os.path.exists(cli_args.build_dir):
os.mkdir(cli_args.build_dir) os.mkdir(cli_args.build_dir)
create_default_kunitconfig()
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
...@@ -270,10 +275,6 @@ def main(argv, linux=None): ...@@ -270,10 +275,6 @@ def main(argv, linux=None):
if result.status != KunitStatus.SUCCESS: if result.status != KunitStatus.SUCCESS:
sys.exit(1) sys.exit(1)
elif cli_args.subcommand == 'build': elif cli_args.subcommand == 'build':
if cli_args.build_dir:
if not os.path.exists(cli_args.build_dir):
os.mkdir(cli_args.build_dir)
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
...@@ -288,10 +289,6 @@ def main(argv, linux=None): ...@@ -288,10 +289,6 @@ def main(argv, linux=None):
if result.status != KunitStatus.SUCCESS: if result.status != KunitStatus.SUCCESS:
sys.exit(1) sys.exit(1)
elif cli_args.subcommand == 'exec': elif cli_args.subcommand == 'exec':
if cli_args.build_dir:
if not os.path.exists(cli_args.build_dir):
os.mkdir(cli_args.build_dir)
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
......
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