From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j6t@kdbg.org>, Beat Bolli <dev+git@drbeat.li>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] t3900: add some more quotes
Date: Wed, 10 Jan 2018 13:31:22 -0800 [thread overview]
Message-ID: <xmqqy3l5z9hx.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180110195323.GA26186@sigill.intra.peff.net> (Jeff King's message of "Wed, 10 Jan 2018 14:53:23 -0500")
Jeff King <peff@peff.net> writes:
> Yeah. One of the reasons for both of the errors in this thread is the
> nested double-quoting. Using single quotes is awkward because we're
> already using them to delimit the whole snippet. I've often wondered if
> our tests would be more readable taking the snippet over stdin.
> Something like:
> +test_expect_success 'UTF-8 invalid characters refused' - <<\EOT
> + test_when_finished 'rm -f "$HOME/stderr $HOME/invalid"' &&
> ...
> -'
> +EOT
>
> +# Read from stdin into the variable given in $1.
> +test_read_to_eof () {
> + # Bash's "read" is sufficiently flexible that we can skip the extra
> + # process.
> + if test -n "$BASH_VERSION"
> + then
> + # 64k should be enough for anyone...
> + read -N 65536 -r "$1"
> + else
> + # command substitution eats trailing whitespace, so we add
> + # and then remove a non-whitespace character.
> + eval "$1=\$(cat; printf x)"
> + eval "$1=\${$1%x}"
> + fi
> +}
Yuck. Hacky but nice.
I think this will make it easier to read but I suspect here text
would use temporary files and may slow things down a bit? I do not
know if it is even measurable, though.
> +
> test_expect_failure () {
> test_start_
> test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
> test "$#" = 2 ||
> error "bug in the test script: not 2 or 3 parameters to test-expect-failure"
> + if test "$2" = "-"
> + then
> + test_read_to_eof test_block
> + set -- "$1" "$test_block"
> + fi
> test_verify_prereq
> export test_prereq
> if ! test_skip "$@"
> @@ -416,6 +437,11 @@ test_expect_success () {
> test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
> test "$#" = 2 ||
> error "bug in the test script: not 2 or 3 parameters to test-expect-success"
> + if test "$2" = "-"
> + then
> + test_read_to_eof test_block
> + set -- "$1" "$test_block"
> + fi
> test_verify_prereq
> export test_prereq
> if ! test_skip "$@"
next prev parent reply other threads:[~2018-01-10 21:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 9:58 [PATCH] t3900: add some more quotes Beat Bolli
2018-01-10 10:33 ` Jeff King
2018-01-10 17:21 ` Johannes Schindelin
2018-01-10 17:44 ` Eric Sunshine
2018-01-10 22:38 ` [PATCH v2] " Beat Bolli
2018-01-10 23:09 ` Johannes Schindelin
2018-01-10 23:09 ` Junio C Hamano
2018-01-10 19:02 ` [PATCH] " Johannes Sixt
2018-01-10 19:43 ` Junio C Hamano
2018-01-10 19:53 ` Jeff King
2018-01-10 21:31 ` Junio C Hamano [this message]
2018-01-11 9:38 ` Jeff King
2018-01-11 11:39 ` read test snippet from stdin [was: [PATCH] t3900: add some more quotes] SZEDER Gábor
2018-01-11 12:11 ` 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=xmqqy3l5z9hx.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dev+git@drbeat.li \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/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).