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:     David Gow <davidgow@google.com>,
        Brendan Higgins <brendanhiggins@google.com>,
        Daniel Latypov <dlatypov@google.com>
Cc:     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>
From:   Shuah Khan <skhan@linuxfoundation.org>
Message-ID: <99c2564c-4175-7e3e-84c3-3bcb6d4f9d58@linuxfoundation.org>
Date:   Fri, 25 Jun 2021 10:11:29 -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: <20210625111603.358518-1-davidgow@google.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

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.


thanks,

-- Shuah