On Thu, May 28, 2020 at 2:28 PM Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> > > > > 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@xxxxxxxxxxx> > > Reviewed-by: Brendan Higgins <brendanhiggins@xxxxxxxxxx> > > Signed-off-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> > > 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
