Browse Source

t9402: sed -i is not portable

On some systems sed allows the usage of e.g.
sed -i -e "s/line1/line2/" afile
to edit the file "in place".
Other systems don't allow that: one observed behaviour is that
sed -i -e "s/line1/line2/" afile
creates a backup file called afile-e, which breaks the test.
As sed -i is not part of POSIX, avoid it.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Torsten Bögershausen 12 years ago committed by Junio C Hamano
parent
commit
76095f6d60
  1. 9
      t/t9402-git-cvsserver-refs.sh

9
t/t9402-git-cvsserver-refs.sh

@ -155,7 +155,8 @@ test_expect_success 'cvs co b1 [cvswork3]' ' @@ -155,7 +155,8 @@ test_expect_success 'cvs co b1 [cvswork3]' '

test_expect_success 'edit cvswork3 and save diff' '
( cd cvswork3 &&
sed -i -e "s/line1/line1 - data/" adir/afile &&
sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
mv -f adir/afileNEW adir/afile &&
echo "afile5" > adir/afile5 &&
rm t2 &&
cvs -f add adir/afile5 &&
@ -168,7 +169,8 @@ test_expect_success 'setup v1.2 on b1' ' @@ -168,7 +169,8 @@ test_expect_success 'setup v1.2 on b1' '
git checkout b1 &&
echo "new v1.2" > t3 &&
rm t2 &&
sed -i -e "s/line3/line3 - more data/" adir/afile &&
sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
mv -f adir/afileNEW adir/afile &&
rm adir/a2file &&
echo "a3file" >> adir/a3file &&
echo "bfile line 3" >> adir/bdir/bfile &&
@ -300,7 +302,8 @@ test_expect_success 'root dir rm file [cvswork2]' ' @@ -300,7 +302,8 @@ test_expect_success 'root dir rm file [cvswork2]' '

test_expect_success 'subdir edit/add/rm files [cvswork2' '
( cd cvswork2 &&
sed -i -e "s/line 1/line 1 (v2)/" adir/bdir/bfile &&
sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW &&
mv -f adir/bdir/bfileNEW adir/bdir/bfile &&
rm adir/bdir/b2file &&
cd adir &&
cvs -f rm bdir/b2file &&

Loading…
Cancel
Save