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
Signed-off-by: Vitor Massaru Iha <[email protected]>
---
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 7dca74774dd2..5da190c79481 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -116,7 +116,7 @@ def main(argv, linux=None):
run_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')
run_parser.add_argument('--defconfig',
help='Uses a default .kunitconfig.',
@@ -136,12 +136,11 @@ def main(argv, linux=None):
if get_kernel_root_path():
os.chdir(get_kernel_root_path())
- 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 cli_args.defconfig:
create_default_kunitconfig()
--
2.25.1
On Tue, Apr 14, 2020 at 4:09 PM Vitor Massaru Iha <[email protected]> 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
>
> Signed-off-by: Vitor Massaru Iha <[email protected]>
Reviewed-by: Brendan Higgins <[email protected]>
On 4/16/20 5:11 PM, Brendan Higgins wrote:
> On Tue, Apr 14, 2020 at 4:09 PM Vitor Massaru Iha <[email protected]> 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
>>
>> Signed-off-by: Vitor Massaru Iha <[email protected]>
>
> Reviewed-by: Brendan Higgins <[email protected]>
>
Applied the patch to kselftest/kunit on top of
45ba7a893ad89114e773b3dc32f6431354c465d6
kunit: kunit_tool: Separate out config/build/exec/parse
from David's work resolving merge conflicts. Please check if it is
sane.
thanks,
-- Shuah
Hi Shuah,
On Fri, 2020-05-22 at 16:40 -0600, shuah wrote:
> On 4/16/20 5:11 PM, Brendan Higgins wrote:
> > On Tue, Apr 14, 2020 at 4:09 PM Vitor Massaru Iha <
> > [email protected]> 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
> > >
> > > Signed-off-by: Vitor Massaru Iha <[email protected]>
> >
> > Reviewed-by: Brendan Higgins <[email protected]>
> >
>
> Applied the patch to kselftest/kunit on top of
>
> 45ba7a893ad89114e773b3dc32f6431354c465d6
> kunit: kunit_tool: Separate out config/build/exec/parse
>
> from David's work resolving merge conflicts. Please check if it is
> sane.
>
> thanks,
> -- Shuah
The kunit branch had some problems related to identation. KUnit's code
has mixed identation, and with that, in conflict correction, it ended
up breaking python.
In addition I found a bug: related to the creation of the .kunitconfig
file inside the default build directory. Should I send the patch again?
Or do I make a bugfix patch?
BR,
Vitor
On Mon, 2020-05-25 at 22:52 -0300, Vitor Massaru Iha wrote:
> Hi Shuah,
>
> On Fri, 2020-05-22 at 16:40 -0600, shuah wrote:
> > On 4/16/20 5:11 PM, Brendan Higgins wrote:
> > > On Tue, Apr 14, 2020 at 4:09 PM Vitor Massaru Iha <
> > > [email protected]> 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
> > > >
> > > > Signed-off-by: Vitor Massaru Iha <[email protected]>
> > >
> > > Reviewed-by: Brendan Higgins <[email protected]>
> > >
> >
> > Applied the patch to kselftest/kunit on top of
> >
> > 45ba7a893ad89114e773b3dc32f6431354c465d6
> > kunit: kunit_tool: Separate out config/build/exec/parse
> >
> > from David's work resolving merge conflicts. Please check if it is
> > sane.
> >
> > thanks,
> > -- Shuah
>
> The kunit branch had some problems related to identation. KUnit's
> code
> has mixed identation, and with that, in conflict correction, it ended
> up breaking python.
>
> In addition I found a bug: related to the creation of the
> .kunitconfig
> file inside the default build directory.
This is actually related to the other patch "kunit: use KUnit defconfig
by default"
> Should I send the patch again?
> Or do I make a bugfix patch?
>
> BR,
> Vitor
>
On 5/25/20 8:27 PM, Vitor Massaru Iha wrote:
> On Mon, 2020-05-25 at 22:52 -0300, Vitor Massaru Iha wrote:
>> Hi Shuah,
>>
>> On Fri, 2020-05-22 at 16:40 -0600, shuah wrote:
>>> On 4/16/20 5:11 PM, Brendan Higgins wrote:
>>>> On Tue, Apr 14, 2020 at 4:09 PM Vitor Massaru Iha <
>>>> [email protected]> 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
>>>>>
>>>>> Signed-off-by: Vitor Massaru Iha <[email protected]>
>>>>
>>>> Reviewed-by: Brendan Higgins <[email protected]>
>>>>
>>>
>>> Applied the patch to kselftest/kunit on top of
>>>
>>> 45ba7a893ad89114e773b3dc32f6431354c465d6
>>> kunit: kunit_tool: Separate out config/build/exec/parse
>>>
>>> from David's work resolving merge conflicts. Please check if it is
>>> sane.
>>>
>>> thanks,
>>> -- Shuah
>>
>> The kunit branch had some problems related to identation. KUnit's
>> code
>> has mixed identation, and with that, in conflict correction, it ended
>> up breaking python.
>>
Thanks for sanity checking my merge.
>> In addition I found a bug: related to the creation of the
>> .kunitconfig
>> file inside the default build directory.
>
> This is actually related to the other patch "kunit: use KUnit defconfig
> by default"
>
>
>> Should I send the patch again?
>> Or do I make a bugfix patch?
>>
Please send the fix.
thanks,
-- Shuah