From: cgit at cryptocrack.de (Lukas Fleischer)
Subject: [PATCH v2 1/2] tests/: Do not use `sed -i`
Date: Tue, 9 Apr 2013 20:02:32 +0200 [thread overview]
Message-ID: <1365530553-15381-1-git-send-email-cgit@cryptocrack.de> (raw)
"-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>
---
Now uses a temporary file in order not to lose the exit status of
cgit_url.
tests/t0010-validate-html.sh | 4 ++--
tests/t0020-validate-cache.sh | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh
index 5bd0a25..ca08d69 100755
--- a/tests/t0010-validate-html.sh
+++ b/tests/t0010-validate-html.sh
@@ -8,8 +8,8 @@ test_url()
{
tidy_opt="-eq"
test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
- cgit_url "$1" >tidy-$test_count || return
- sed -ie "1,4d" tidy-$test_count || return
+ cgit_url "$1" >tidy-$test_count.tmp || return
+ sed -e "1,4d" tidy-$test_count.tmp >tidy-$test_count || return
"$tidy" $tidy_opt tidy-$test_count
rc=$?
diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.sh
index 1910b47..7e7379a 100755
--- a/tests/t0020-validate-cache.sh
+++ b/tests/t0020-validate-cache.sh
@@ -6,7 +6,8 @@ test_description='Validate cache'
test_expect_success 'verify cache-size=0' '
rm -f cache/* &&
- sed -i -e "s/cache-size=1021$/cache-size=0/" cgitrc &&
+ sed -e "s/cache-size=1021$/cache-size=0/" cgitrc >cgitrc.tmp &&
+ mv -f cgitrc.tmp cgitrc &&
cgit_url "" &&
cgit_url "foo" &&
cgit_url "foo/refs" &&
@@ -27,7 +28,8 @@ test_expect_success 'verify cache-size=0' '
test_expect_success 'verify cache-size=1' '
rm -f cache/* &&
- sed -i -e "s/cache-size=0$/cache-size=1/" cgitrc &&
+ sed -e "s/cache-size=0$/cache-size=1/" cgitrc >cgitrc.tmp &&
+ mv -f cgitrc.tmp cgitrc &&
cgit_url "" &&
cgit_url "foo" &&
cgit_url "foo/refs" &&
@@ -48,7 +50,8 @@ test_expect_success 'verify cache-size=1' '
test_expect_success 'verify cache-size=1021' '
rm -f cache/* &&
- sed -i -e "s/cache-size=1$/cache-size=1021/" cgitrc &&
+ sed -e "s/cache-size=1$/cache-size=1021/" cgitrc >cgitrc.tmp &&
+ mv -f cgitrc.tmp cgitrc &&
cgit_url "" &&
cgit_url "foo" &&
cgit_url "foo/refs" &&
--
1.8.2.675.gda3bb24.dirty
next reply other threads:[~2013-04-09 18:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 18:02 cgit [this message]
2013-04-09 18:02 ` [PATCH v2 2/2] t0107: Skip ZIP tests if unzip(1) isn't available cgit
2013-04-09 18:13 ` Jason
2013-04-09 18:13 ` [PATCH v2 1/2] tests/: Do not use `sed -i` Jason
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=1365530553-15381-1-git-send-email-cgit@cryptocrack.de \
--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).