From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 1/3] tests/: Do not use `sed -i`
Date: Mon, 8 Apr 2013 19:24:35 +0100 [thread overview]
Message-ID: <20130408182435.GV2222@serenity.lan> (raw)
In-Reply-To: <1365445100-3877-1-git-send-email-cgit@cryptocrack.de>
On Mon, Apr 08, 2013 at 08:18:18PM +0200, Lukas Fleischer wrote:
> "-i" isn't part of the POSIX standard and doesn't work on several
> platforms such as OpenBSD. Use a temporary file instead.
>
> Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
> ---
> tests/t0010-validate-html.sh | 3 +--
> tests/t0020-validate-cache.sh | 9 ++++++---
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh
> index 3fe4800..a27c7bb 100755
> --- a/tests/t0010-validate-html.sh
> +++ b/tests/t0010-validate-html.sh
> @@ -7,8 +7,7 @@ test_url()
> {
> tidy_opt="-eq"
> test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
> - cgit_url "$1" >trash/tidy-$test_count || return
> - sed -ie "1,4d" trash/tidy-$test_count || return
> + cgit_url "$1" | sed -e "1,4d" trash/tidy-$test_count || return
Please don't pipe the output like this, it loses the exit code from
cgit_url (and hence cgit) and may cause us to miss crashes.
The rest of this patch looks sensible - I'd probably use a suffix of "+"
rather than ".tmp", but that's just taste. ;-)
> "$tidy" $tidy_opt trash/tidy-$test_count
> rc=$?
>
> diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.sh
> index 53ec2eb..19db93d 100755
> --- a/tests/t0020-validate-cache.sh
> +++ b/tests/t0020-validate-cache.sh
> @@ -7,7 +7,8 @@ prepare_tests 'Validate cache'
> run_test 'verify cache-size=0' '
>
> rm -f trash/cache/* &&
> - sed -i -e "s/cache-size=1021$/cache-size=0/" trash/cgitrc &&
> + sed -e "s/cache-size=1021$/cache-size=0/" trash/cgitrc >trash/cgitrc.tmp &&
> + mv trash/cgitrc.tmp trash/cgitrc &&
> cgit_url "" &&
> cgit_url "foo" &&
> cgit_url "foo/refs" &&
> @@ -27,7 +28,8 @@ run_test 'verify cache-size=0' '
> run_test 'verify cache-size=1' '
>
> rm -f trash/cache/* &&
> - sed -i -e "s/cache-size=0$/cache-size=1/" trash/cgitrc &&
> + sed -e "s/cache-size=0$/cache-size=1/" trash/cgitrc >trash/cgitrc.tmp &&
> + mv trash/cgitrc.tmp trash/cgitrc &&
> cgit_url "" &&
> cgit_url "foo" &&
> cgit_url "foo/refs" &&
> @@ -47,7 +49,8 @@ run_test 'verify cache-size=1' '
> run_test 'verify cache-size=1021' '
>
> rm -f trash/cache/* &&
> - sed -i -e "s/cache-size=1$/cache-size=1021/" trash/cgitrc &&
> + sed -e "s/cache-size=1$/cache-size=1021/" trash/cgitrc >trash/cgitrc.tmp &&
> + mv trash/cgitrc.tmp trash/cgitrc &&
> cgit_url "" &&
> cgit_url "foo" &&
> cgit_url "foo/refs" &&
> --
> 1.8.2.675.gda3bb24.dirty
prev parent reply other threads:[~2013-04-08 18:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 18:18 cgit
2013-04-08 18:18 ` [PATCH 2/3] t0107: Skip ZIP tests if unzip(1) isn't available cgit
2013-04-08 18:26 ` john
2013-04-08 18:41 ` Jason
2013-04-08 18:47 ` cgit
2013-04-08 18:49 ` john
2013-04-08 22:19 ` Jason
2013-04-08 22:23 ` john
2013-04-08 20:57 ` Jason
2013-04-08 18:18 ` [PATCH 3/3] t0107: Use `tar -z` for gzip'ed archives cgit
2013-04-08 22:15 ` Jason
2013-04-08 18:24 ` john [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=20130408182435.GV2222@serenity.lan \
--to=cgit@lists.zx2c4.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).