linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Latypov <dlatypov@google.com>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: 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>,
	Brendan Higgins <brendanhiggins@google.com>
Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Tue, 19 Oct 2021 14:40:34 -0700	[thread overview]
Message-ID: <CAGS_qxqeFfrqptjgbX9D2boCxm-5fUfc_1u15v=YQS6-9duRRw@mail.gmail.com> (raw)
In-Reply-To: <009188fd-a744-fb50-a9d2-ca1ce9b7905f@linuxfoundation.org>

On Tue, Oct 19, 2021 at 2:26 PM Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> On 10/8/21 10:31 AM, Shuah Khan wrote:
> > On 10/7/21 10:29 PM, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Today's linux-next merge of the kunit-next tree got a conflict in:
> >>
> >>    tools/testing/kunit/kunit.py
> >>
> >> between commit:
> >>
> >>    d8c23ead708b ("kunit: tool: better handling of quasi-bool args (--json, --raw_output)")
> >>
> >> from the kunit-fixes tree and commit:
> >>
> >>    6710951ee039 ("kunit: tool: support running each suite/test separately")
> >>
> >> from the kunit-next tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary. This
> >> is now fixed as far as linux-next is concerned, but any non trivial
> >> conflicts should be mentioned to your upstream maintainer when your tree
> >> is submitted for merging.  You may also want to consider cooperating
> >> with the maintainer of the conflicting tree to minimise any particularly
> >> complex conflicts.
> >>
> >
> > Thank you for the fixing it up. I will fix this up in the kunit-next once
> > the kunit-fixes pull request goes out.
> >
>
> I fixed the merge conflict in kunit-next tree after rebase to Linux 5.15-rc6.
> There is no need to carry this fix.
>
> Daniel! Please review to see if it looks good. It was very minor fix-up.

ff9e09a3762fbd7aba83cfd1530972b57ae52b3b looks good to me.
Thanks, Shuah!

To be extra safe, I checked

Test that test-level filtering and hermetic testing work as expected
$ ./tools/testing/kunit/kunit.py run --run_isolated=suite '*ex*.*skipped*'
$ ./tools/testing/kunit/kunit.py run --run_isolated=suite '*ex*.*s[iu]*'

kunit.py's unit test:
$ ./tools/testing/kunit/kunit_tool_test.py

Type-checkers:
$ pytype ./tools/testing/kunit/*.py
$ mypy ./tools/testing/kunit/*.py  # this had the expected errors

>
> - from typing import Iterable, Sequence
>   -from typing import Iterable, List
> ++from typing import Iterable, Sequence, List
>
> thanks,
> -- Shuah
>

  reply	other threads:[~2021-10-19 21:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-08  4:29 linux-next: manual merge of the kunit-next tree with the kunit-fixes tree Stephen Rothwell
2021-10-08 16:31 ` Shuah Khan
2021-10-08 20:03   ` Brendan Higgins
2021-10-08 20:48     ` Daniel Latypov
2021-10-19 21:26   ` Shuah Khan
2021-10-19 21:40     ` Daniel Latypov [this message]
2021-10-19 22:20     ` Stephen Rothwell
2022-11-01  3:31 Stephen Rothwell
2023-02-01  2:49 Stephen Rothwell
2023-02-01  4:31 ` David Gow
2023-02-01  5:37   ` Stephen Rothwell

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='CAGS_qxqeFfrqptjgbX9D2boCxm-5fUfc_1u15v=YQS6-9duRRw@mail.gmail.com' \
    --to=dlatypov@google.com \
    --cc=brendanhiggins@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).