From: Brendan Higgins <brendanhiggins@google.com>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: Daniel Latypov <dlatypov@google.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
David Gow <davidgow@google.com>
Subject: Re: linux-next: build failure after merge of the kunit-fixes tree
Date: Fri, 25 Jun 2021 11:46:46 -0700 [thread overview]
Message-ID: <CAFd5g46jjCzRjRWL3oYSb9Xhe6VY8U=0-MfgG-Y=NxQNoK++vA@mail.gmail.com> (raw)
In-Reply-To: <4f1fc11b-64a6-984f-ede3-d4ce5c0ac3e3@linuxfoundation.org>
On Fri, Jun 25, 2021 at 11:12 AM Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> 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
I just pulled and tested and can confirm it is working for me now.
Thanks!
next prev parent reply other threads:[~2021-06-25 18:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 9:52 linux-next: build failure after merge of the kunit-fixes tree Stephen Rothwell
2021-06-25 17:53 ` Daniel Latypov
2021-06-25 18:12 ` Shuah Khan
2021-06-25 18:46 ` Brendan Higgins [this message]
2021-06-25 10:05 Stephen Rothwell
2021-06-25 11:31 ` David Gow
2021-06-25 15:48 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFd5g46jjCzRjRWL3oYSb9Xhe6VY8U=0-MfgG-Y=NxQNoK++vA@mail.gmail.com' \
--to=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=dlatypov@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.