From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: git@vger.kernel.org, Sangeeta <sangunb09@gmail.com>,
Philippe Blain <levraiphilippeblain@gmail.com>,
Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
Christian Couder <christian.couder@gmail.com>,
Lars Schneider <larsxschneider@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] t/perf: fix test_export() failure with BSD `sed`
Date: Wed, 16 Dec 2020 11:07:42 -0800 [thread overview]
Message-ID: <xmqq5z514lj5.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201216073907.62591-1-sunshine@sunshineco.com> (Eric Sunshine's message of "Wed, 16 Dec 2020 02:39:07 -0500")
Eric Sunshine <sunshine@sunshineco.com> writes:
> Fortunately, alternation is unnecessary in this case and can easily be
> avoided, so replace it with a series of simple expressions such as
> `s/^var1/.../p;s/^var2/.../p`.
Simple is good.
> While at it, tighten the expressions so they match the variable names
> exactly rather than matching prefixes (i.e. use `s/^var1=/.../p`).
Good eyes. That is quite good.
> @@ -148,13 +148,18 @@ test_run_perf_ () {
> . '"$TEST_DIRECTORY"/test-lib-functions.sh'
> test_export () {
> [ $# != 0 ] || return 0
> - test_export_="$test_export_\\|$1"
> + test_export_="$test_export_ $1"
> shift
> test_export "$@"
> }
This "recursion to consume $@ one by one, instead of looping" caught
my eyes a bit, but the bug being fixed is not caused by it, so it is
fine to let it pass. Given that the arguments to test_export are
supposed to be all variable names (i.e. no funny characters anywhere
in it), I think it could just be
test_export () {
test_export_="$*"
}
though.
Oh, does anybody need to clear test_export_ to an empty string (or
unset it), by the way?
> '"$1"'
> ret=$?
> -set | sed -n "s'"/'/'\\\\''/g"';s/^\\($test_export_\\)/export '"'&'"'/p" >test_vars
> +needles=
> +for v in $test_export_
> +do
> + needles="$needles;s/^$v=/export $v=/p"
> +done
> +set | sed -n "s'"/'/'\\\\''/g"'$needles" >test_vars
> exit $ret' >&3 2>&4
> eval_ret=$?
Other than these, none of which were "this is wrong and needs to be
fixed", I have no comments. The patch is quite readably done.
Will queue. Thanks.
next prev parent reply other threads:[~2020-12-16 19:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 7:39 [PATCH] t/perf: fix test_export() failure with BSD `sed` Eric Sunshine
2020-12-16 19:07 ` Junio C Hamano [this message]
2020-12-16 19:29 ` Eric Sunshine
2020-12-18 5:42 ` Jeff King
2020-12-18 6:15 ` Eric Sunshine
2020-12-18 6:24 ` Jeff King
2020-12-21 7:23 ` Eric Sunshine
2020-12-20 21:27 ` [PATCH 2/1] t/perf: avoid unnecessary test_export() recursion Eric Sunshine
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=xmqq5z514lj5.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=kaartic.sivaraam@gmail.com \
--cc=larsxschneider@gmail.com \
--cc=levraiphilippeblain@gmail.com \
--cc=sangunb09@gmail.com \
--cc=sunshine@sunshineco.com \
/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).