2020-05-26 18:36:47

by Vitor Massaru Iha

Subject: [fixup] kunit: use --build_dir=.kunit as default

To make KUnit easier to use, and to avoid overwriting object and
.config files, the default KUnit build directory is set to .kunit

* Related bug: https://bugzilla.kernel.org/show_bug.cgi?id=205221

Fixed up minor merge conflicts - Shuah Khan <[email protected]>

Signed-off-by: Vitor Massaru Iha <[email protected]>
Reviewed-by: Brendan Higgins <[email protected]>
Signed-off-by: Shuah Khan <[email protected]>
---
version after merge on kunit brach:
* fix identation (tabs instead of spaces)
---
tools/testing/kunit/kunit.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index b01838b6f5f9..b3490271a103 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -169,7 +169,7 @@ def add_common_opts(parser):
parser.add_argument('--build_dir',
help='As in the make command, it specifies the build '
'directory.',
- type=str, default='', metavar='build_dir')
+ type=str, default='.kunit', metavar='build_dir')
parser.add_argument('--make_options',
help='X=Y make option, can be repeated.',
action='append')
@@ -245,12 +245,11 @@ def main(argv, linux=None):
cli_args = parser.parse_args(argv)

if cli_args.subcommand == 'run':
- if cli_args.build_dir:
- if not os.path.exists(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(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 linux:
linux = kunit_kernel.LinuxSourceTree()
--
2.26.2

2020-05-27 04:23:32

by Vitor Massaru Iha

Subject: Re: [fixup] kunit: use --build_dir=.kunit as default

On Tue, 2020-05-26 at 16:29 -0600, Shuah Khan wrote:
> On 5/26/20 12:34 PM, Vitor Massaru Iha wrote:
> > To make KUnit easier to use, and to avoid overwriting object and
> > .config files, the default KUnit build directory is set to .kunit
> >
> > * Related bug: https://bugzilla.kernel.org/show_bug.cgi?id=205221
> >
> > Fixed up minor merge conflicts - Shuah Khan <
> > [email protected]>
> >
> > Signed-off-by: Vitor Massaru Iha <[email protected]>
> > Reviewed-by: Brendan Higgins <[email protected]>
> > Signed-off-by: Shuah Khan <[email protected]>
> > ---
> > version after merge on kunit brach:
> > * fix identation (tabs instead of spaces)
>
> You mentioned spaces breaking python. Please include the python
> errors and make it clear in the change log what is fixes.

Of course, I will add this.
>
> thanks,
> -- Shuah
>

2020-05-27 09:15:37

by Shuah Khan

Subject: Re: [fixup] kunit: use --build_dir=.kunit as default

On 5/26/20 12:34 PM, Vitor Massaru Iha wrote:
> To make KUnit easier to use, and to avoid overwriting object and
> .config files, the default KUnit build directory is set to .kunit
>
> * Related bug: https://bugzilla.kernel.org/show_bug.cgi?id=205221
>
> Fixed up minor merge conflicts - Shuah Khan <[email protected]>
>
> Signed-off-by: Vitor Massaru Iha <[email protected]>
> Reviewed-by: Brendan Higgins <[email protected]>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> version after merge on kunit brach:
> * fix identation (tabs instead of spaces)

You mentioned spaces breaking python. Please include the python
errors and make it clear in the change log what is fixes.

thanks,
-- Shuah