Commit d43c7fb0 authored by Brendan Higgins's avatar Brendan Higgins Committed by Shuah Khan

kunit: tool: fix improper treatment of file location

Commit 01397e82 ("kunit: Fix TabError, remove defconfig code and
handle when there is no kunitconfig") and commit 45ba7a89 ("kunit:
kunit_tool: Separate out config/build/exec/parse") introduced two
closely related issues which built off of each other: they excessively
created the build directory when not present and modified a constant
(constants in Python only exist by convention).

Together these issues broken a number of unit tests for KUnit tool, so
fix them.

Fixed up commit log to fic checkpatch commit description style error.
Shuah Khan <skhan@linuxfoundation.org>

Fixes: 01397e82 ("kunit: Fix TabError, remove defconfig code and handle when there is no kunitconfig")
Fixes: 45ba7a89 ("kunit: kunit_tool: Separate out config/build/exec/parse")
Signed-off-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 6816fe61
...@@ -238,12 +238,6 @@ def main(argv, linux=None): ...@@ -238,12 +238,6 @@ def main(argv, linux=None):
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)
kunit_kernel.kunitconfig_path = os.path.join(
cli_args.build_dir,
kunit_kernel.kunitconfig_path)
if not os.path.exists(kunit_kernel.kunitconfig_path):
create_default_kunitconfig()
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
...@@ -261,12 +255,6 @@ def main(argv, linux=None): ...@@ -261,12 +255,6 @@ 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)
kunit_kernel.kunitconfig_path = os.path.join(
cli_args.build_dir,
kunit_kernel.kunitconfig_path)
if not os.path.exists(kunit_kernel.kunitconfig_path):
create_default_kunitconfig()
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
...@@ -283,12 +271,6 @@ def main(argv, linux=None): ...@@ -283,12 +271,6 @@ 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)
kunit_kernel.kunitconfig_path = os.path.join(
cli_args.build_dir,
kunit_kernel.kunitconfig_path)
if not os.path.exists(kunit_kernel.kunitconfig_path):
create_default_kunitconfig()
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
...@@ -307,12 +289,6 @@ def main(argv, linux=None): ...@@ -307,12 +289,6 @@ 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)
kunit_kernel.kunitconfig_path = os.path.join(
cli_args.build_dir,
kunit_kernel.kunitconfig_path)
if not os.path.exists(kunit_kernel.kunitconfig_path):
create_default_kunitconfig()
if not linux: if not linux:
linux = kunit_kernel.LinuxSourceTree() linux = kunit_kernel.LinuxSourceTree()
......
...@@ -240,7 +240,7 @@ class KUnitMainTest(unittest.TestCase): ...@@ -240,7 +240,7 @@ class KUnitMainTest(unittest.TestCase):
pass pass
def test_config_passes_args_pass(self): def test_config_passes_args_pass(self):
kunit.main(['config'], self.linux_source_mock) kunit.main(['config', '--build_dir=.kunit'], self.linux_source_mock)
assert self.linux_source_mock.build_reconfig.call_count == 1 assert self.linux_source_mock.build_reconfig.call_count == 1
assert self.linux_source_mock.run_kernel.call_count == 0 assert self.linux_source_mock.run_kernel.call_count == 0
...@@ -315,7 +315,7 @@ class KUnitMainTest(unittest.TestCase): ...@@ -315,7 +315,7 @@ class KUnitMainTest(unittest.TestCase):
def test_run_builddir(self): def test_run_builddir(self):
build_dir = '.kunit' build_dir = '.kunit'
kunit.main(['run', '--build_dir', build_dir], self.linux_source_mock) kunit.main(['run', '--build_dir=.kunit'], self.linux_source_mock)
assert self.linux_source_mock.build_reconfig.call_count == 1 assert self.linux_source_mock.build_reconfig.call_count == 1
self.linux_source_mock.run_kernel.assert_called_once_with( self.linux_source_mock.run_kernel.assert_called_once_with(
build_dir=build_dir, timeout=300) build_dir=build_dir, timeout=300)
......
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