about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2013-04-09 20:02:32 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2013-04-10 14:49:31 +0200
commit016364d4edef261fb55257e36d8a47828d398f96 (patch)
treee5730d3da3dca74177398f3e7ba3f01911a32916
parentAdd branch-sort and repo.branch-sort options. (diff)
downloadcgit-pink-016364d4edef261fb55257e36d8a47828d398f96.tar.gz
cgit-pink-016364d4edef261fb55257e36d8a47828d398f96.zip
tests/: Do not use `sed -i`
"-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@cryptocrack.de>
-rwxr-xr-xtests/t0010-validate-html.sh4
-rwxr-xr-xtests/t0020-validate-cache.sh9
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" &&