[PATCH v2 1/2] tests/: Do not use `sed -i`

[PATCH v2 1/2] tests/: Do not use `sed -i`

[cgit]

"-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

[PATCH v2 2/2] t0107: Skip ZIP tests if unzip(1) isn't available

[cgit]

Note that we cannot use skip_all here since some tests have already been
executed when ZIP tests are reached. Use test prerequisites to skip
everything using unzip(1) if the binary is not available instead.

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
Rebased on current master.

 tests/t0107-snapshot.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index 7e6f5bf..053062c 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -54,21 +54,27 @@ test_expect_success 'strip off the header lines (zip)' '
 	tail -n +6 tmp >master.zip
 '
 
-test_expect_success 'verify zip format' '
+if test -n "$(which unzip 2>/dev/null)"; then
+	test_set_prereq UNZIP
+else
+	say 'Skipping ZIP validation tests: unzip not found'
+fi
+
+test_expect_success UNZIP 'verify zip format' '
 	unzip -t master.zip
 '
 
-test_expect_success 'unzip' '
+test_expect_success UNZIP 'unzip' '
 	rm -rf master &&
 	unzip master.zip
 '
 
-test_expect_success 'count files (zip)' '
+test_expect_success UNZIP 'count files (zip)' '
 	ls master/ >output &&
 	test_line_count = 5 output
 '
 
-test_expect_success 'verify unzipped file-5' '
+test_expect_success UNZIP 'verify unzipped file-5' '
 	grep "^5$" master/file-5 &&
 	test_line_count = 1 master/file-5
 '
-- 
1.8.2.675.gda3bb24.dirty

[PATCH v2 2/2] t0107: Skip ZIP tests if unzip(1) isn't available

[Jason]

Merged to WIP. Thanks.

[PATCH v2 1/2] tests/: Do not use `sed -i`

[Jason]

Merged to WIP. Thanks.