From: Heidi Fahim <heidifahim@google.com>
To: shuah <shuah@kernel.org>
Cc: Brendan Higgins <brendanhiggins@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"open list:KERNEL SELFTEST FRAMEWORK"
<linux-kselftest@vger.kernel.org>,
KUnit Development <kunit-dev@googlegroups.com>
Subject: Re: [PATCH v2 1/2] kunit: kunit_parser: make parser more robust
Date: Mon, 16 Mar 2020 13:27:19 -0700 [thread overview]
Message-ID: <CAMVcs3uBetxWdLw=R86D1by3+SJO3ruo5Z7UUA_YHF9Hu3BKFw@mail.gmail.com> (raw)
In-Reply-To: <b8777872-189b-b361-6ff4-c7cd51772dfd@kernel.org>
On Fri, Mar 13, 2020 at 1:22 PM shuah <shuah@kernel.org> wrote:
>
> On 3/5/20 2:25 PM, Brendan Higgins wrote:
> > On Thu, Mar 5, 2020 at 12:04 PM Heidi Fahim <heidifahim@google.com> wrote:
> >>
> >> Previously, kunit_parser did not properly handle kunit TAP output that
> >> - had any prefixes (generated from different configs e.g.
> >> CONFIG_PRINTK_TIME)
> >> - had unrelated kernel output mixed in the middle of
> >> it, which has shown up when testing with allyesconfig
> >> To remove prefixes, the parser looks for the first line that includes
> >> TAP output, "TAP version 14". It then determines the length of the
> >> string before this sequence, and strips that number of characters off
> >> the beginning of the following lines until the last KUnit output line is
> >> reached.
> >> These fixes have been tested with additional tests in the
> >> KUnitParseTest and their associated logs have also been added.
> >>
> >> Signed-off-by: Heidi Fahim <heidifahim@google.com>
> >
> > Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
> >
>
> Heidi and Brendan,
>
> git apply is throwing away formatting in
>
> tools/testing/kunit/test_data/test_config_printk_time.log
>
>
> Applying: kunit: kunit_parser: make parser more robust
> .git/rebase-apply/patch:396: space before tab in indent.
> # Subtest: kunit-resource-test
> .git/rebase-apply/patch:397: space before tab in indent.
> 1..5
> .git/rebase-apply/patch:398: space before tab in indent.
> ok 1 - kunit_resource_test_init_resources
> .git/rebase-apply/patch:399: space before tab in indent.
> ok 2 - kunit_resource_test_alloc_resource
> .git/rebase-apply/patch:400: space before tab in indent.
> ok 3 - kunit_resource_test_destroy_resource
> warning: squelched 11 whitespace errors
> warning: 16 lines add whitespace errors.
>
> Can you fix this and resend patches. If apply this as is,
> all the formatting you have in there goes away.
>
> This is what gets applied.
>
> [ 0.060000] TAP version 14
> [ 0.060000] # Subtest: kunit-resource-test
> [ 0.060000] 1..5
> [ 0.060000] ok 1 - kunit_resource_test_init_resources
> [ 0.060000] ok 2 - kunit_resource_test_alloc_resource
> [ 0.060000] ok 3 - kunit_resource_test_destroy_resource
> [ 0.060000] ok 4 - kunit_resource_test_cleanup_resources
> [ 0.060000] ok 5 - kunit_resource_test_proper_free_ordering
> [ 0.060000] ok 1 - kunit-resource-test
> [ 0.060000] # Subtest: kunit-try-catch-test
> [ 0.060000] 1..2
> [ 0.060000] ok 1 - kunit_test_try_catch_successful_try_no_catch
> [ 0.060000] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch
> [ 0.060000] ok 2 - kunit-try-catch-test
> [ 0.060000] # Subtest: string-stream-test
> [ 0.060000] 1..3
> [ 0.060000] ok 1 - string_stream_test_empty_on_creation
> [ 0.060000] ok 2 - string_stream_test_not_empty_after_add
> [ 0.060000] ok 3 - string_stream_test_get_string
> [ 0.060000] ok 3 - string-stream-test
> [ 0.060000] List of all partitions:
> [ 0.060000] No filesystem could mount root, tried:
>
> thanks,
> -- Shuah
Thanks Shuah. I made the fix by marking the .log files as binaries
which should make the git apply work well now. See my v3 patch for
specifics.
Best,
Heidi
prev parent reply other threads:[~2020-03-16 20:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 20:04 [PATCH v2 1/2] kunit: kunit_parser: make parser more robust Heidi Fahim
2020-03-05 20:04 ` [PATCH v2 2/2] kunit: Run all KUnit tests through allyesconfig Heidi Fahim
2020-03-05 21:26 ` Brendan Higgins
2020-03-05 21:25 ` [PATCH v2 1/2] kunit: kunit_parser: make parser more robust Brendan Higgins
2020-03-13 20:22 ` shuah
2020-03-16 20:27 ` Heidi Fahim [this message]
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='CAMVcs3uBetxWdLw=R86D1by3+SJO3ruo5Z7UUA_YHF9Hu3BKFw@mail.gmail.com' \
--to=heidifahim@google.com \
--cc=brendanhiggins@google.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.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).