diff options
author | Lukas Fleischer <cgit@cryptocrack.de> | 2013-04-10 03:02:32 (JST) |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-04-10 21:49:31 (JST) |
commit | 016364d4edef261fb55257e36d8a47828d398f96 (patch) | |
tree | e5730d3da3dca74177398f3e7ba3f01911a32916 | |
parent | 389cc17357e2040c9542d3e085f64a8d2f085e9a (diff) | |
download | cgit-016364d4edef261fb55257e36d8a47828d398f96.zip cgit-016364d4edef261fb55257e36d8a47828d398f96.tar.gz |
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-x | tests/t0010-validate-html.sh | 4 | ||||
-rwxr-xr-x | 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() | |||
8 | { | 8 | { |
9 | tidy_opt="-eq" | 9 | tidy_opt="-eq" |
10 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" | 10 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" |
11 | cgit_url "$1" >tidy-$test_count || return | 11 | cgit_url "$1" >tidy-$test_count.tmp || return |
12 | sed -ie "1,4d" tidy-$test_count || return | 12 | sed -e "1,4d" tidy-$test_count.tmp >tidy-$test_count || return |
13 | "$tidy" $tidy_opt tidy-$test_count | 13 | "$tidy" $tidy_opt tidy-$test_count |
14 | rc=$? | 14 | rc=$? |
15 | 15 | ||
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' | |||
6 | test_expect_success 'verify cache-size=0' ' | 6 | test_expect_success 'verify cache-size=0' ' |
7 | 7 | ||
8 | rm -f cache/* && | 8 | rm -f cache/* && |
9 | sed -i -e "s/cache-size=1021$/cache-size=0/" cgitrc && | 9 | sed -e "s/cache-size=1021$/cache-size=0/" cgitrc >cgitrc.tmp && |
10 | mv -f cgitrc.tmp cgitrc && | ||
10 | cgit_url "" && | 11 | cgit_url "" && |
11 | cgit_url "foo" && | 12 | cgit_url "foo" && |
12 | cgit_url "foo/refs" && | 13 | cgit_url "foo/refs" && |
@@ -27,7 +28,8 @@ test_expect_success 'verify cache-size=0' ' | |||
27 | test_expect_success 'verify cache-size=1' ' | 28 | test_expect_success 'verify cache-size=1' ' |
28 | 29 | ||
29 | rm -f cache/* && | 30 | rm -f cache/* && |
30 | sed -i -e "s/cache-size=0$/cache-size=1/" cgitrc && | 31 | sed -e "s/cache-size=0$/cache-size=1/" cgitrc >cgitrc.tmp && |
32 | mv -f cgitrc.tmp cgitrc && | ||
31 | cgit_url "" && | 33 | cgit_url "" && |
32 | cgit_url "foo" && | 34 | cgit_url "foo" && |
33 | cgit_url "foo/refs" && | 35 | cgit_url "foo/refs" && |
@@ -48,7 +50,8 @@ test_expect_success 'verify cache-size=1' ' | |||
48 | test_expect_success 'verify cache-size=1021' ' | 50 | test_expect_success 'verify cache-size=1021' ' |
49 | 51 | ||
50 | rm -f cache/* && | 52 | rm -f cache/* && |
51 | sed -i -e "s/cache-size=1$/cache-size=1021/" cgitrc && | 53 | sed -e "s/cache-size=1$/cache-size=1021/" cgitrc >cgitrc.tmp && |
54 | mv -f cgitrc.tmp cgitrc && | ||
52 | cgit_url "" && | 55 | cgit_url "" && |
53 | cgit_url "foo" && | 56 | cgit_url "foo" && |
54 | cgit_url "foo/refs" && | 57 | cgit_url "foo/refs" && |