global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

t: refactor tests depending on Perl substitution operator

Browse Source 
We have a bunch of tests that use Perl to perform substitution via the
"s/" operator. These usecases can be trivially replaced with sed(1) and
tr(1).

Refactor the tests accordingly so that we can drop a couple of
PERL_TEST_HELPERS prerequisites.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-04-03 07:06:02 +02:00
committed by Junio C Hamano
parent db8ff64a3a
commit cdbdc6bf8c
11 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/t9137-git-svn-dcommit-clobber-series.sh
View File

@@ -15,13 +15,13 @@ test_expect_success 'initialize repo' '
test -e file
'
test_expect_success PERL_TEST_HELPERS '(supposedly) non-conflicting change from SVN' '
test_expect_success '(supposedly) non-conflicting change from SVN' '
test x"$(sed -n -e 58p < file)" = x58 &&
test x"$(sed -n -e 61p < file)" = x61 &&
svn_cmd co "$svnrepo" tmp &&
(cd tmp &&
perl -i.bak -p -e "s/^58$/5588/" file &&
perl -i.bak -p -e "s/^61$/6611/" file &&
sed -e "s/^58$/5588/" -e "s/^61$/6611/" file >file.munged &&
mv file.munged file &&
poke file &&
test x"$(sed -n -e 58p < file)" = x5588 &&
test x"$(sed -n -e 61p < file)" = x6611 &&
@@ -37,11 +37,13 @@ test_expect_success 'some unrelated changes to git' "
git commit -m bye-life life
"
test_expect_success PERL_TEST_HELPERS 'change file but in unrelated area' "
test_expect_success 'change file but in unrelated area' "
test x\"\$(sed -n -e 4p < file)\" = x4 &&
test x\"\$(sed -n -e 7p < file)\" = x7 &&
perl -i.bak -p -e 's/^4\$/4444/' file &&
perl -i.bak -p -e 's/^7\$/7777/' file &&
sed -e 's/^4\$/4444/' \
-e 's/^7\$/7777/' \
file >file.munged &&
mv file.munged file &&
test x\"\$(sed -n -e 4p < file)\" = x4444 &&
test x\"\$(sed -n -e 7p < file)\" = x7777 &&
git commit -m '4 => 4444, 7 => 7777' file &&