From: Jeff King <peff@peff.net>
To: Danh Doan <congdanhqx@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 6/6] t4124: fix test for non-compliance diff
Date: Fri, 20 Mar 2020 01:23:14 -0400 [thread overview]
Message-ID: <20200320052314.GB499858@coredump.intra.peff.net> (raw)
In-Reply-To: <20200320015223.GG1858@danh.dev>
On Fri, Mar 20, 2020 at 08:52:23AM +0700, Danh Doan wrote:
> > diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
> > index 971a5a7512..15cb0c81b7 100755
> > --- a/t/t4124-apply-ws-rule.sh
> > +++ b/t/t4124-apply-ws-rule.sh
> > @@ -50,8 +50,9 @@ test_fix () {
> > # fix should not barf
> > apply_patch --whitespace=fix || return 1
> >
> > - # find touched lines
> > - $DIFF file target | sed -n -e "s/^> //p" >fixed
> > + # find touched lines; handle either normal or unified
> > + # diff, as system diff may generate either
> > + $DIFF file target | grep '^[>+][^+]' >fixed
> >
> > # the changed lines are all expected to change
> > fixed_cnt=$(wc -l <fixed)
> >
> > seems to work for with both busybox diff and GNU diff.
>
> 3 lines after this one:
>
> ?*) expect_cnt=$(grep "[$1]" <fixed | wc -l) ;;
>
> As of now, we could simply replace sed with grep entirely,
> because ! "$1" ~"[>+]".
>
> Considering the complicated of:
>
> test_expect_success "rule=$rule" '
> git config core.whitespace "$rule" &&
> test_fix "$tt$ts$ti$th"
> '
>
> I think it's better to use sed here.
Fair enough. I think it's OK now, but I agree that it puts a pretty
subtle assumption into the test_fix function (and that's far removed
from what actual tests will call it with, so it's easy to miss). Using
sed should be more maintainable.
-Peff
next prev parent reply other threads:[~2020-03-20 5:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 14:00 [PATCH 0/6] fix test failure with busybox Đoàn Trần Công Danh
2020-03-19 14:00 ` [PATCH 1/6] t4061: use POSIX compliance regex(7) Đoàn Trần Công Danh
2020-03-19 15:53 ` Jeff King
2020-03-19 16:01 ` Eric Sunshine
2020-03-19 22:02 ` Junio C Hamano
2020-03-20 1:35 ` Danh Doan
2020-03-19 14:00 ` [PATCH 2/6] test-lib-functions: test_cmp: eval $GIT_TEST_CMP Đoàn Trần Công Danh
2020-03-19 16:02 ` Jeff King
2020-03-19 16:14 ` Eric Sunshine
2020-03-20 1:29 ` Danh Doan
2020-03-19 14:00 ` [PATCH 3/6] t5003: skip conversion test if unzip -a is unavailable Đoàn Trần Công Danh
2020-03-19 16:03 ` Jeff King
2020-03-20 0:39 ` Danh Doan
2020-03-20 5:32 ` Jeff King
2020-03-19 14:00 ` [PATCH 4/6] t5616: use rev-parse instead to get HEAD's object_id Đoàn Trần Công Danh
2020-03-19 16:07 ` Jeff King
2020-03-20 0:57 ` Danh Doan
2020-03-19 14:00 ` [PATCH 5/6] t7063: use POSIX find(1) syntax Đoàn Trần Công Danh
2020-03-19 16:12 ` Jeff King
2020-03-19 22:16 ` Junio C Hamano
2020-03-20 1:41 ` Danh Doan
2020-03-20 2:20 ` Danh Doan
2020-03-20 5:37 ` Jeff King
2020-03-22 0:37 ` Danh Doan
2020-03-22 6:05 ` Jeff King
2020-03-19 14:00 ` [PATCH 6/6] t4124: fix test for non-compliance diff Đoàn Trần Công Danh
2020-03-19 16:33 ` Jeff King
2020-03-19 22:58 ` Junio C Hamano
2020-03-20 5:20 ` Jeff King
2020-03-20 1:52 ` Danh Doan
2020-03-20 5:23 ` Jeff King [this message]
2020-03-19 15:51 ` [PATCH 0/6] fix test failure with busybox Jeff King
2020-03-20 0:37 ` Danh Doan
2020-03-20 5:30 ` Jeff King
2020-03-19 16:34 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200320052314.GB499858@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=congdanhqx@gmail.com \
--cc=git@vger.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).