From 016364d4edef261fb55257e36d8a47828d398f96 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 9 Apr 2013 20:02:32 +0200 Subject: 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> --- tests/t0010-validate-html.sh | 4 ++-- tests/t0020-validate-cache.sh | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'tests') 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" && -- cgit v1.2.3-54-g00ecf id='n1' href='#n1'>1</a> <a id='n2' href='#n2'>2</a> <a id='n3' href='#n3'>3</a> <a id='n4' href='#n4'>4</a> <a id='n5' href='#n5'>5</a> <a id='n6' href='#n6'>6</a> <a id='n7' href='#n7'>7</a> <a id='n8' href='#n8'>8</a> <a id='n9' href='#n9'>9</a> <a id='n10' href='#n10'>10</a> <a id='n11' href='#n11'>11</a> <a id='n12' href='#n12'>12</a> <a id='n13' href='#n13'>13</a> <a id='n14' href='#n14'>14</a> <a id='n15' href='#n15'>15</a> <a id='n16' href='#n16'>16</a> <a id='n17' href='#n17'>17</a> <a id='n18' href='#n18'>18</a> <a id='n19' href='#n19'>19</a> <a id='n20' href='#n20'>20</a> <a id='n21' href='#n21'>21</a> <a id='n22' href='#n22'>22</a> <a id='n23' href='#n23'>23</a> <a id='n24' href='#n24'>24</a> <a id='n25' href='#n25'>25</a> <a id='n26' href='#n26'>26</a> <a id='n27' href='#n27'>27</a> <a id='n28' href='#n28'>28</a> <a id='n29' href='#n29'>29</a> <a id='n30' href='#n30'>30</a> <a id='n31' href='#n31'>31</a> <a id='n32' href='#n32'>32</a> <a id='n33' href='#n33'>33</a> <a id='n34' href='#n34'>34</a> <a id='n35' href='#n35'>35</a> <a id='n36' href='#n36'>36</a> <a id='n37' href='#n37'>37</a> <a id='n38' href='#n38'>38</a> <a id='n39' href='#n39'>39</a> <a id='n40' href='#n40'>40</a> <a id='n41' href='#n41'>41</a> </pre></td> <td class='lines'><pre><code>