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: linux-next: build failure after merge of the kunit-fixes tree
To:     Daniel Latypov <dlatypov@google.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Brendan Higgins <brendanhiggins@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        David Gow <davidgow@google.com>,
        Shuah Khan <skhan@linuxfoundation.org>
References: <20210625195232.3a307e53@canb.auug.org.au>
 <CAGS_qxq4_G7dbefETo57hUZgD+A3QK7rxiY=Nk=m0xZGt35zGw@mail.gmail.com>
From:   Shuah Khan <skhan@linuxfoundation.org>
Message-ID: <4f1fc11b-64a6-984f-ede3-d4ce5c0ac3e3@linuxfoundation.org>
Date:   Fri, 25 Jun 2021 12:12:28 -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_qxq4_G7dbefETo57hUZgD+A3QK7rxiY=Nk=m0xZGt35zGw@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:53 AM, Daniel Latypov wrote:
> On Fri, Jun 25, 2021 at 2:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the kunit-fixes tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> lib/kunit/executor.c:26:1: error: expected identifier or '(' before '+' token
>>     26 | +kunit_filter_subsuite(struct kunit_suite * const * const subsuite,
>>        | ^
>> lib/kunit/executor.c: At top level:
>> lib/kunit/executor.c:140:10: fatal error: executor_test.c: No such file or directory
>>    140 | #include "executor_test.c"
>>        |          ^~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>    c9d80ffc5a0a ("kunit: add unit test for filtering suites by names")
> 
> For posterity, David sent out a patch addressing this here:
> https://lore.kernel.org/linux-kselftest/20210625111603.358518-1-davidgow@google.com/
> 

It is all fixed now. When I applied this patch yesterday, I needed to
fix merge conflicts. When I did that the newly added file was left
behind.

Build didn't find it since the file was in the repo. Oh well. So much
for trying to save you a rebase.

Sorry for the trouble. It should all be squared away now. Build and
exec tested it for sanity.

https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=kunit-fixes&id=1d71307a6f94df3750f8f884545a769e227172fe

thanks,
-- Shuah