Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] kunit: Fix merge issue in suite filtering test
To:     Daniel Latypov <dlatypov@google.com>
Cc:     David Gow <davidgow@google.com>,
        Brendan Higgins <brendanhiggins@google.com>,
        kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org,
        linux-kernel@vger.kernel.org, kernel test robot <lkp@intel.com>,
        Shuah Khan <skhan@linuxfoundation.org>
References: <20210625111603.358518-1-davidgow@google.com>
 <99c2564c-4175-7e3e-84c3-3bcb6d4f9d58@linuxfoundation.org>
 <CAGS_qxqCBZy+b1-pFc4Eh9AExc7XRkB2LZ2b776bX=oY2C4qfw@mail.gmail.com>
From:   Shuah Khan <skhan@linuxfoundation.org>
Message-ID: <ec43df62-36dd-03b5-0a8c-8387938f83fc@linuxfoundation.org>
Date:   Fri, 25 Jun 2021 11:24:55 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <CAGS_qxqCBZy+b1-pFc4Eh9AExc7XRkB2LZ2b776bX=oY2C4qfw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 6/25/21 11:08 AM, Daniel Latypov wrote:
> On Fri, Jun 25, 2021 at 9:11 AM Shuah Khan <skhan@linuxfoundation.org> wrote:
>>
>> On 6/25/21 5:16 AM, David Gow wrote:
>>> There were a couple of errors introuced when
>>> "kunit: add unit test for filtering suites by names"[1] was merged in
>>> c9d80ffc5a.
>>>
>>> An erroneous '+' was introduced in executor.c, and the executor_test.c
>>> file went missing. This causes the kernel to fail to compile if
>>> CONFIG_KUNIT is enabled, as reported in [2,3].
>>>
>>> As with the original, I've tested by running just the new tests using
>>> itself:
>>> $ ./tools/testing/kunit/kunit.py run '*exec*'
>>>
>>> [1]: https://lore.kernel.org/linux-kselftest/20210421020427.2384721-1-dlatypov@google.com/
>>> [2]: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/6IKQX5JXZF7I3NFH4IAWUMHXEQSCPNDP/
>>> [3]: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/EKY7ZH5YDCCTSJF2G7XFPMGIXQSUVD3Y/
>>>
>>> Fixes: c9d80ffc5a ("kunit: add unit test for filtering suites by names")
>>> Reported-by: kernel test robot <lkp@intel.com>
>>> Signed-off-by: David Gow <davidgow@google.com>
>>> ---
>>>
>>> This is another fix for the kunit-fixes branch, where there seems to
>>> have been an issue merging the "kunit: add unit test for filtering
>>> suites by names" patch here:
>>> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=kunit-fixes&id=c9d80ffc5a0a30955de0b8c5c46a05906d417800
>>>
>>> Again, feel free to squash this into the original patch if that works
>>> better.
>>>
>>
>> Thank you. My bad. Applied to kunit-fixes now.
> 
> Hmm, it looks like executor_test.c might not have made it into kunit-fixes.
> I believe this is the applied version of this patch:
> 
> $ git show d833ce7480864d4d7eb2dbb04320858be3578b2a --stat
> commit d833ce7480864d4d7eb2dbb04320858be3578b2a
> Author: David Gow <davidgow@google.com>
> Date:   Fri Jun 25 04:16:03 2021 -0700
> 
>      kunit: Fix merge issue in suite filtering test
> ...
>   lib/kunit/executor.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> The result looks like this:
> $ ./tools/testing/kunit/kunit.py run
> ...
> $ make ARCH=um --jobs=8 O=.kunit
> ERROR:root:../lib/kunit/executor.c:140:10: fatal error:
> executor_test.c: No such file or directory
>    140 | #include "executor_test.c"
>        |          ^~~~~~~~~~~~~~~~~
> 
> 
> I just `git am` or something just really doesn't like executor_test.c :)
> 
>

My mistake it looks like in merging the patch. I had to fix merge
conflicts and made a mistake. I will fix it now.

Odd that my local compile didn't catch the problem. I used the
tools/testing/kunit/kunit.py build

thanks,
-- Shuah