From: SeongJae Park <[email protected]>
This patchset contains trivial fixes for the kunit documentations and the
wrapper python scripts.
SeongJae Park (6):
docs/kunit/start: Use in-tree 'kunit_defconfig'
docs/kunit/start: Skip wrapper run command
kunit: Remove duplicated defconfig creation
kunit: Create default config in 'build_dir'
kunit: Place 'test.log' under the 'build_dir'
kunit: Rename 'kunitconfig' to '.kunitconfig'
Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
tools/testing/kunit/kunit.py | 10 ++++++----
tools/testing/kunit/kunit_kernel.py | 6 +++---
3 files changed, 14 insertions(+), 21 deletions(-)
--
2.7.4
From: SeongJae Park <[email protected]>
This commit renames 'kunitconfig' to '.kunitconfig' so that it can be
automatically ignored by git and do not disturb people who want to type
'kernel/' by pressing only the 'k' and then 'tab' key.
Signed-off-by: SeongJae Park <[email protected]>
---
Documentation/dev-tools/kunit/start.rst | 12 +++++-------
tools/testing/kunit/kunit.py | 2 +-
tools/testing/kunit/kunit_kernel.py | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Documentation/dev-tools/kunit/start.rst b/Documentation/dev-tools/kunit/start.rst
index e25978d..f2e585e 100644
--- a/Documentation/dev-tools/kunit/start.rst
+++ b/Documentation/dev-tools/kunit/start.rst
@@ -15,18 +15,16 @@ Included with KUnit is a simple Python wrapper that helps format the output to
easily use and read KUnit output. It handles building and running the kernel, as
well as formatting the output.
-Creating a kunitconfig
-======================
+Creating a .kunitconfig
+=======================
The Python script is a thin wrapper around Kbuild as such, it needs to be
-configured with a ``kunitconfig`` file. This file essentially contains the
+configured with a ``.kunitconfig`` file. This file essentially contains the
regular Kernel config, with the specific test targets as well.
.. code-block:: bash
cd $PATH_TO_LINUX_REPO
- cp arch/um/configs/kunit_defconfig kunitconfig
-
-You may want to add kunitconfig to your local gitignore.
+ cp arch/um/configs/kunit_defconfig .kunitconfig
Verifying KUnit Works
---------------------
@@ -141,7 +139,7 @@ and the following to ``drivers/misc/Makefile``:
obj-$(CONFIG_MISC_EXAMPLE_TEST) += example-test.o
-Now add it to your ``kunitconfig``:
+Now add it to your ``.kunitconfig``:
.. code-block:: none
diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index 1746330..309d6e3 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -108,7 +108,7 @@ def main(argv, linux=None):
type=str, default=None, metavar='build_dir')
run_parser.add_argument('--defconfig',
- help='Uses a default kunitconfig.',
+ help='Uses a default .kunitconfig.',
action='store_true')
cli_args = parser.parse_args(argv)
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index b640939..507364d 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -14,7 +14,7 @@ import os
import kunit_config
KCONFIG_PATH = '.config'
-KUNITCONFIG_PATH = 'kunitconfig'
+KUNITCONFIG_PATH = '.kunitconfig'
class ConfigError(Exception):
"""Represents an error trying to configure the Linux kernel."""
@@ -111,7 +111,7 @@ class LinuxSourceTree(object):
return True
def build_reconfig(self, build_dir):
- """Creates a new .config if it is not a subset of the kunitconfig."""
+ """Creates a new .config if it is not a subset of the .kunitconfig."""
kconfig_path = get_kconfig_path(build_dir)
if os.path.exists(kconfig_path):
existing_kconfig = kunit_config.Kconfig()
--
2.7.4
From: SeongJae Park <[email protected]>
If both '--build_dir' and '--defconfig' are given, the handling of
'--defconfig' ignores '--build_dir' option. This commit modifies the
behavior to respect '--build_dir' option.
Signed-off-by: SeongJae Park <[email protected]>
---
tools/testing/kunit/kunit.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index f8f2695..1746330 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -114,6 +114,11 @@ def main(argv, linux=None):
cli_args = parser.parse_args(argv)
if cli_args.subcommand == 'run':
+ if cli_args.build_dir:
+ kunit_kernel.KUNITCONFIG_PATH = os.path.join(
+ cli_args.build_dir,
+ kunit_kernel.KUNITCONFIG_PATH)
+
if cli_args.defconfig:
create_default_kunitconfig()
--
2.7.4
On Sun, Dec 1, 2019 at 3:25 PM SeongJae Park <[email protected]> wrote:
>
> From: SeongJae Park <[email protected]>
>
> If both '--build_dir' and '--defconfig' are given, the handling of
> '--defconfig' ignores '--build_dir' option. This commit modifies the
> behavior to respect '--build_dir' option.
>
> Signed-off-by: SeongJae Park <[email protected]>
> ---
> tools/testing/kunit/kunit.py | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
> index f8f2695..1746330 100755
> --- a/tools/testing/kunit/kunit.py
> +++ b/tools/testing/kunit/kunit.py
> @@ -114,6 +114,11 @@ def main(argv, linux=None):
> cli_args = parser.parse_args(argv)
>
> if cli_args.subcommand == 'run':
> + if cli_args.build_dir:
> + kunit_kernel.KUNITCONFIG_PATH = os.path.join(
If you are going to modify the value of KUNITCONFIG_PATH can you
rename the variable to make it lower_snake_case? UPPER_SNAKE_CASE in
Python is usually (at least in this directory) used to indicate the
variable is a constant.
> + cli_args.build_dir,
> + kunit_kernel.KUNITCONFIG_PATH)
> +
> if cli_args.defconfig:
> create_default_kunitconfig()
>
> --
> 2.7.4
>
On Mon, Dec 02, 2019 at 08:25:18AM +0900, SeongJae Park wrote:
> From: SeongJae Park <[email protected]>
>
> This patchset contains trivial fixes for the kunit documentations and the
> wrapper python scripts.
>
> SeongJae Park (6):
> docs/kunit/start: Use in-tree 'kunit_defconfig'
> docs/kunit/start: Skip wrapper run command
> kunit: Remove duplicated defconfig creation
> kunit: Create default config in 'build_dir'
> kunit: Place 'test.log' under the 'build_dir'
> kunit: Rename 'kunitconfig' to '.kunitconfig'
>
> Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
> tools/testing/kunit/kunit.py | 10 ++++++----
> tools/testing/kunit/kunit_kernel.py | 6 +++---
> 3 files changed, 14 insertions(+), 21 deletions(-)
I applied your patchset to torvalds/master, ran the command:
tools/testing/kunit/kunit.py run --timeout=60 --jobs=8 --defconfig --build_dir=.kunit
and got the error:
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 140, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 123, in main
create_default_kunitconfig()
File "tools/testing/kunit/kunit.py", line 36, in create_default_kunitconfig
kunit_kernel.KUNITCONFIG_PATH)
File "/usr/lib/python3.7/shutil.py", line 121, in copyfile
with open(dst, 'wb') as fdst:
FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
It seems that it expects the build_dir to already exist; however, I
don't think this is clear from the error message. Would you mind
addressing that here?
Cheers!
On Tue, Dec 3, 2019 at 8:00 AM Brendan Higgins
<[email protected]> wrote:
>
> On Mon, Dec 02, 2019 at 08:25:18AM +0900, SeongJae Park wrote:
> > From: SeongJae Park <[email protected]>
> >
> > This patchset contains trivial fixes for the kunit documentations and the
> > wrapper python scripts.
> >
> > SeongJae Park (6):
> > docs/kunit/start: Use in-tree 'kunit_defconfig'
> > docs/kunit/start: Skip wrapper run command
> > kunit: Remove duplicated defconfig creation
> > kunit: Create default config in 'build_dir'
> > kunit: Place 'test.log' under the 'build_dir'
> > kunit: Rename 'kunitconfig' to '.kunitconfig'
> >
> > Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
> > tools/testing/kunit/kunit.py | 10 ++++++----
> > tools/testing/kunit/kunit_kernel.py | 6 +++---
> > 3 files changed, 14 insertions(+), 21 deletions(-)
>
> I applied your patchset to torvalds/master, ran the command:
>
> tools/testing/kunit/kunit.py run --timeout=60 --jobs=8 --defconfig --build_dir=.kunit
>
> and got the error:
>
> Traceback (most recent call last):
> File "tools/testing/kunit/kunit.py", line 140, in <module>
> main(sys.argv[1:])
> File "tools/testing/kunit/kunit.py", line 123, in main
> create_default_kunitconfig()
> File "tools/testing/kunit/kunit.py", line 36, in create_default_kunitconfig
> kunit_kernel.KUNITCONFIG_PATH)
> File "/usr/lib/python3.7/shutil.py", line 121, in copyfile
> with open(dst, 'wb') as fdst:
> FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
>
> It seems that it expects the build_dir to already exist; however, I
> don't think this is clear from the error message. Would you mind
> addressing that here?
Thank you for sharing this. I will take a look!
Thanks,
SeongJae Park
>
> Cheers!
You're right, the error was due to the assumption of the existence of the
build_dir. The "kunit: Create default config in '--build_dir'" patch made the
bug. I fixed it in the second version patchset[1].
[1] https://lore.kernel.org/linux-doc/[email protected]/
Thanks,
SeongJae Park
On Tue, Dec 3, 2019 at 8:10 AM SeongJae Park <[email protected]> wrote:
>
> On Tue, Dec 3, 2019 at 8:00 AM Brendan Higgins
> <[email protected]> wrote:
> >
> > On Mon, Dec 02, 2019 at 08:25:18AM +0900, SeongJae Park wrote:
> > > From: SeongJae Park <[email protected]>
> > >
> > > This patchset contains trivial fixes for the kunit documentations and the
> > > wrapper python scripts.
> > >
> > > SeongJae Park (6):
> > > docs/kunit/start: Use in-tree 'kunit_defconfig'
> > > docs/kunit/start: Skip wrapper run command
> > > kunit: Remove duplicated defconfig creation
> > > kunit: Create default config in 'build_dir'
> > > kunit: Place 'test.log' under the 'build_dir'
> > > kunit: Rename 'kunitconfig' to '.kunitconfig'
> > >
> > > Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
> > > tools/testing/kunit/kunit.py | 10 ++++++----
> > > tools/testing/kunit/kunit_kernel.py | 6 +++---
> > > 3 files changed, 14 insertions(+), 21 deletions(-)
> >
> > I applied your patchset to torvalds/master, ran the command:
> >
> > tools/testing/kunit/kunit.py run --timeout=60 --jobs=8 --defconfig --build_dir=.kunit
> >
> > and got the error:
> >
> > Traceback (most recent call last):
> > File "tools/testing/kunit/kunit.py", line 140, in <module>
> > main(sys.argv[1:])
> > File "tools/testing/kunit/kunit.py", line 123, in main
> > create_default_kunitconfig()
> > File "tools/testing/kunit/kunit.py", line 36, in create_default_kunitconfig
> > kunit_kernel.KUNITCONFIG_PATH)
> > File "/usr/lib/python3.7/shutil.py", line 121, in copyfile
> > with open(dst, 'wb') as fdst:
> > FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
> >
> > It seems that it expects the build_dir to already exist; however, I
> > don't think this is clear from the error message. Would you mind
> > addressing that here?
>
> Thank you for sharing this. I will take a look!
>
>
> Thanks,
> SeongJae Park
> >
> > Cheers!
On Tue, Dec 3, 2019 at 7:41 AM Brendan Higgins
<[email protected]> wrote:
>
> On Sun, Dec 1, 2019 at 3:25 PM SeongJae Park <[email protected]> wrote:
> >
> > From: SeongJae Park <[email protected]>
> >
> > If both '--build_dir' and '--defconfig' are given, the handling of
> > '--defconfig' ignores '--build_dir' option. This commit modifies the
> > behavior to respect '--build_dir' option.
> >
> > Signed-off-by: SeongJae Park <[email protected]>
> > ---
> > tools/testing/kunit/kunit.py | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
> > index f8f2695..1746330 100755
> > --- a/tools/testing/kunit/kunit.py
> > +++ b/tools/testing/kunit/kunit.py
> > @@ -114,6 +114,11 @@ def main(argv, linux=None):
> > cli_args = parser.parse_args(argv)
> >
> > if cli_args.subcommand == 'run':
> > + if cli_args.build_dir:
> > + kunit_kernel.KUNITCONFIG_PATH = os.path.join(
>
> If you are going to modify the value of KUNITCONFIG_PATH can you
> rename the variable to make it lower_snake_case? UPPER_SNAKE_CASE in
> Python is usually (at least in this directory) used to indicate the
> variable is a constant.
Changed as you suggested in the second version patchset[1].
[1] https://lore.kernel.org/linux-doc/[email protected]/
Thanks,
SeongJae Park
>
> > + cli_args.build_dir,
> > + kunit_kernel.KUNITCONFIG_PATH)
> > +
> > if cli_args.defconfig:
> > create_default_kunitconfig()
> >
> > --
> > 2.7.4
> >
On Tue, Dec 3, 2019 at 12:26 AM SeongJae Park <[email protected]> wrote:
>
> You're right, the error was due to the assumption of the existence of the
> build_dir. The "kunit: Create default config in '--build_dir'" patch made the
> bug. I fixed it in the second version patchset[1].
>
> [1] https://lore.kernel.org/linux-doc/[email protected]/
After trying your new patches, I am still getting the
"FileNotFoundError" when the given build_dir has not been created.
> Thanks,
> SeongJae Park
>
> On Tue, Dec 3, 2019 at 8:10 AM SeongJae Park <[email protected]> wrote:
> >
> > On Tue, Dec 3, 2019 at 8:00 AM Brendan Higgins
> > <[email protected]> wrote:
> > >
> > > On Mon, Dec 02, 2019 at 08:25:18AM +0900, SeongJae Park wrote:
> > > > From: SeongJae Park <[email protected]>
> > > >
> > > > This patchset contains trivial fixes for the kunit documentations and the
> > > > wrapper python scripts.
> > > >
> > > > SeongJae Park (6):
> > > > docs/kunit/start: Use in-tree 'kunit_defconfig'
> > > > docs/kunit/start: Skip wrapper run command
> > > > kunit: Remove duplicated defconfig creation
> > > > kunit: Create default config in 'build_dir'
> > > > kunit: Place 'test.log' under the 'build_dir'
> > > > kunit: Rename 'kunitconfig' to '.kunitconfig'
> > > >
> > > > Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
> > > > tools/testing/kunit/kunit.py | 10 ++++++----
> > > > tools/testing/kunit/kunit_kernel.py | 6 +++---
> > > > 3 files changed, 14 insertions(+), 21 deletions(-)
> > >
> > > I applied your patchset to torvalds/master, ran the command:
> > >
> > > tools/testing/kunit/kunit.py run --timeout=60 --jobs=8 --defconfig --build_dir=.kunit
> > >
> > > and got the error:
> > >
> > > Traceback (most recent call last):
> > > File "tools/testing/kunit/kunit.py", line 140, in <module>
> > > main(sys.argv[1:])
> > > File "tools/testing/kunit/kunit.py", line 123, in main
> > > create_default_kunitconfig()
> > > File "tools/testing/kunit/kunit.py", line 36, in create_default_kunitconfig
> > > kunit_kernel.KUNITCONFIG_PATH)
> > > File "/usr/lib/python3.7/shutil.py", line 121, in copyfile
> > > with open(dst, 'wb') as fdst:
> > > FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
> > >
> > > It seems that it expects the build_dir to already exist; however, I
> > > don't think this is clear from the error message. Would you mind
> > > addressing that here?
> >
> > Thank you for sharing this. I will take a look!
> >
> >
> > Thanks,
> > SeongJae Park
> > >
> > > Cheers!
On Tue, Dec 3, 2019 at 6:45 PM Brendan Higgins
<[email protected]> wrote:
>
> On Tue, Dec 3, 2019 at 12:26 AM SeongJae Park <[email protected]> wrote:
> >
> > You're right, the error was due to the assumption of the existence of the
> > build_dir. The "kunit: Create default config in '--build_dir'" patch made the
> > bug. I fixed it in the second version patchset[1].
> >
> > [1] https://lore.kernel.org/linux-doc/[email protected]/
>
> After trying your new patches, I am still getting the
> "FileNotFoundError" when the given build_dir has not been created.
Sorry, apparently my mistake... Sent v3 fixing it:
https://lore.kernel.org/linux-kselftest/[email protected]/T/#t
Thanks,
SeongJae Park
>
> > Thanks,
> > SeongJae Park
> >
> > On Tue, Dec 3, 2019 at 8:10 AM SeongJae Park <[email protected]> wrote:
> > >
> > > On Tue, Dec 3, 2019 at 8:00 AM Brendan Higgins
> > > <[email protected]> wrote:
> > > >
> > > > On Mon, Dec 02, 2019 at 08:25:18AM +0900, SeongJae Park wrote:
> > > > > From: SeongJae Park <[email protected]>
> > > > >
> > > > > This patchset contains trivial fixes for the kunit documentations and the
> > > > > wrapper python scripts.
> > > > >
> > > > > SeongJae Park (6):
> > > > > docs/kunit/start: Use in-tree 'kunit_defconfig'
> > > > > docs/kunit/start: Skip wrapper run command
> > > > > kunit: Remove duplicated defconfig creation
> > > > > kunit: Create default config in 'build_dir'
> > > > > kunit: Place 'test.log' under the 'build_dir'
> > > > > kunit: Rename 'kunitconfig' to '.kunitconfig'
> > > > >
> > > > > Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
> > > > > tools/testing/kunit/kunit.py | 10 ++++++----
> > > > > tools/testing/kunit/kunit_kernel.py | 6 +++---
> > > > > 3 files changed, 14 insertions(+), 21 deletions(-)
> > > >
> > > > I applied your patchset to torvalds/master, ran the command:
> > > >
> > > > tools/testing/kunit/kunit.py run --timeout=60 --jobs=8 --defconfig --build_dir=.kunit
> > > >
> > > > and got the error:
> > > >
> > > > Traceback (most recent call last):
> > > > File "tools/testing/kunit/kunit.py", line 140, in <module>
> > > > main(sys.argv[1:])
> > > > File "tools/testing/kunit/kunit.py", line 123, in main
> > > > create_default_kunitconfig()
> > > > File "tools/testing/kunit/kunit.py", line 36, in create_default_kunitconfig
> > > > kunit_kernel.KUNITCONFIG_PATH)
> > > > File "/usr/lib/python3.7/shutil.py", line 121, in copyfile
> > > > with open(dst, 'wb') as fdst:
> > > > FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
> > > >
> > > > It seems that it expects the build_dir to already exist; however, I
> > > > don't think this is clear from the error message. Would you mind
> > > > addressing that here?
> > >
> > > Thank you for sharing this. I will take a look!
> > >
> > >
> > > Thanks,
> > > SeongJae Park
> > > >
> > > > Cheers!
On Tue, Dec 3, 2019 at 10:11 AM SeongJae Park <[email protected]> wrote:
>
> On Tue, Dec 3, 2019 at 6:45 PM Brendan Higgins
> <[email protected]> wrote:
> >
> > On Tue, Dec 3, 2019 at 12:26 AM SeongJae Park <[email protected]> wrote:
> > >
> > > You're right, the error was due to the assumption of the existence of the
> > > build_dir. The "kunit: Create default config in '--build_dir'" patch made the
> > > bug. I fixed it in the second version patchset[1].
> > >
> > > [1] https://lore.kernel.org/linux-doc/[email protected]/
> >
> > After trying your new patches, I am still getting the
> > "FileNotFoundError" when the given build_dir has not been created.
>
> Sorry, apparently my mistake... Sent v3 fixing it:
> https://lore.kernel.org/linux-kselftest/[email protected]/T/#t
Awesome, looks like that works now!
Thanks for taking care of this!
> Thanks,
> SeongJae Park
>
>
> >
> > > Thanks,
> > > SeongJae Park
> > >
> > > On Tue, Dec 3, 2019 at 8:10 AM SeongJae Park <[email protected]> wrote:
> > > >
> > > > On Tue, Dec 3, 2019 at 8:00 AM Brendan Higgins
> > > > <[email protected]> wrote:
> > > > >
> > > > > On Mon, Dec 02, 2019 at 08:25:18AM +0900, SeongJae Park wrote:
> > > > > > From: SeongJae Park <[email protected]>
> > > > > >
> > > > > > This patchset contains trivial fixes for the kunit documentations and the
> > > > > > wrapper python scripts.
> > > > > >
> > > > > > SeongJae Park (6):
> > > > > > docs/kunit/start: Use in-tree 'kunit_defconfig'
> > > > > > docs/kunit/start: Skip wrapper run command
> > > > > > kunit: Remove duplicated defconfig creation
> > > > > > kunit: Create default config in 'build_dir'
> > > > > > kunit: Place 'test.log' under the 'build_dir'
> > > > > > kunit: Rename 'kunitconfig' to '.kunitconfig'
> > > > > >
> > > > > > Documentation/dev-tools/kunit/start.rst | 19 +++++--------------
> > > > > > tools/testing/kunit/kunit.py | 10 ++++++----
> > > > > > tools/testing/kunit/kunit_kernel.py | 6 +++---
> > > > > > 3 files changed, 14 insertions(+), 21 deletions(-)
> > > > >
> > > > > I applied your patchset to torvalds/master, ran the command:
> > > > >
> > > > > tools/testing/kunit/kunit.py run --timeout=60 --jobs=8 --defconfig --build_dir=.kunit
> > > > >
> > > > > and got the error:
> > > > >
> > > > > Traceback (most recent call last):
> > > > > File "tools/testing/kunit/kunit.py", line 140, in <module>
> > > > > main(sys.argv[1:])
> > > > > File "tools/testing/kunit/kunit.py", line 123, in main
> > > > > create_default_kunitconfig()
> > > > > File "tools/testing/kunit/kunit.py", line 36, in create_default_kunitconfig
> > > > > kunit_kernel.KUNITCONFIG_PATH)
> > > > > File "/usr/lib/python3.7/shutil.py", line 121, in copyfile
> > > > > with open(dst, 'wb') as fdst:
> > > > > FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
> > > > >
> > > > > It seems that it expects the build_dir to already exist; however, I
> > > > > don't think this is clear from the error message. Would you mind
> > > > > addressing that here?
> > > >
> > > > Thank you for sharing this. I will take a look!
> > > >
> > > >
> > > > Thanks,
> > > > SeongJae Park
> > > > >
> > > > > Cheers!