| Message ID | 20200527003420.34790-1-vitor@massaru.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [fixup,v2] kunit: use --build_dir=.kunit as default | expand |
On 5/26/20 6: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 > > Fixed up minor merge conflicts - Shuah Khan <skhan@linuxfoundation.org> > > Fixed this identation error exchanging spaces for tabs between lines > 248 and 252: > > tools/testing/kunit/kunit.py run --defconfig > > File "tools/testing/kunit/kunit.py", line 254 > if not linux: > ^ > TabError: inconsistent use of tabs and spaces in indentation > > Signed-off-by: Vitor Massaru Iha <vitor@massaru.org> > Reviewed-by: Brendan Higgins <brendanhiggins@google.com> > Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=205221 Vitor, This patch doesn't apply. Can you change to subject to be unique Fix TabError and do the patch on top of linux-kselftest kunit I think you did this, but I can't apply this on top: https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=kunit thanks, -- Shuah
On Thu, May 28, 2020 at 2:28 PM Shuah Khan <skhan@linuxfoundation.org> wrote: > > On 5/26/20 6: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 > > > > Fixed up minor merge conflicts - Shuah Khan <skhan@linuxfoundation.org> > > > > Fixed this identation error exchanging spaces for tabs between lines > > 248 and 252: > > > > tools/testing/kunit/kunit.py run --defconfig > > > > File "tools/testing/kunit/kunit.py", line 254 > > if not linux: > > ^ > > TabError: inconsistent use of tabs and spaces in indentation > > > > Signed-off-by: Vitor Massaru Iha <vitor@massaru.org> > > Reviewed-by: Brendan Higgins <brendanhiggins@google.com> > > Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=205221 > > Vitor, > > This patch doesn't apply. Can you change to subject to be unique > Fix TabError and do the patch on top of linux-kselftest kunit > > I think you did this, but I can't apply this on top: > > https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=kunit > Sure, I'll do that. > thanks, > -- Shuah
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()
To make KUnit easier to use, and to avoid overwriting object and .config files, the default KUnit build directory is set to .kunit Fixed up minor merge conflicts - Shuah Khan <skhan@linuxfoundation.org> Fixed this identation error exchanging spaces for tabs between lines 248 and 252: tools/testing/kunit/kunit.py run --defconfig File "tools/testing/kunit/kunit.py", line 254 if not linux: ^ TabError: inconsistent use of tabs and spaces in indentation Signed-off-by: Vitor Massaru Iha <vitor@massaru.org> Reviewed-by: Brendan Higgins <brendanhiggins@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> Link: https://bugzilla.kernel.org/show_bug.cgi?id=205221 --- version after merge on kunit brach: v1: * fix identation (tabs instead of spaces) v2: * fix v1 changelog description: fix identation (spaces instead of tabs, lines 248-252); * add python error message on commit message; * fix Link tag on commit message. --- tools/testing/kunit/kunit.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)