mirror of
https://github.com/git/git.git
synced 2026-08-09 17:40:16 +00:00
Replace bare grep with test_grep in test assertions across the
suite, including sourced test helpers (lib-*.sh, *-tests.sh).
test_grep prints the contents of the file being searched on
failure, making debugging easier than a bare grep which fails
silently.
Only assertion-style greps are converted: grep used as a filter
in pipelines, command substitutions, conditionals, or with
redirected I/O is left as-is with a "# lint-ok" annotation.
Existing '! test_grep' calls are rewritten to 'test_grep !' so
that the diagnostic output is preserved on failure.
test_grep requires the file it reads to exist, so '! grep'
assertions that inspect a file whose presence is conditional need
care. In t5537 the '.git/shallow' file is still present after the
repack (the client remains shallow), so the assertion is
converted like any other. In t1400 the '.git/packed-refs' file
exists only with the files backend, so its check is guarded with a
REFFILES prerequisite; the backend-agnostic 'git show-ref' check
that follows still runs under every backend. In t7450 'git~2' is
the NTFS 8.3 short name of a '..git' file and only exists
when 8.3 short-name generation is enabled, so its check is guarded
with a 'test -f' on the path and uses test_grep inside the guard,
the same shape as t1400 (a plain test_grep would BUG when the
short name is absent).
The conversion was generated using a grep-assertion linter
(greplint.pl, added in the following commit) to identify bare
grep calls at command position. To reproduce, from the t/
directory:
# Step 1: annotate the two data-filter greps (grep produces
# data, not a verdict) so the linter skips them.
sed -i '/grep -vf before commits\.raw/s/$/ # lint-ok: data filter/' \
t5326-multi-pack-bitmaps.sh
sed -i '/grep -E "^\[0-9a-f\].*|| :/s/$/ # lint-ok: data filter/' \
t5702-protocol-v2.sh
# Step 1b: two '! grep' assertions need more than a mechanical
# conversion; handle them by hand before the linter-driven steps
# below so it leaves them alone.
#
# t1400: '.git/packed-refs' is absent under reftable, so guard the
# check with REFFILES (a plain test_grep would BUG on the missing
# file):
#
# git update-ref -d HEAD $B &&
# - ! grep "$m" .git/packed-refs &&
# + if test_have_prereq REFFILES
# + then
# + test_grep ! "$m" .git/packed-refs
# + fi &&
# test_must_fail git show-ref --verify -q $m
#
# t7450: git~2 is an NTFS 8.3 short name that exists only when
# short-name generation is enabled, so guard the check on its
# presence with 'test -f' and note in a comment why the path can
# be absent (a plain test_grep would BUG when it is):
#
# - ! grep gitdir squatting-clone/d/a/git~2
# + if test -f squatting-clone/d/a/git~2
# + then
# + test_grep ! gitdir squatting-clone/d/a/git~2
# + fi
# Step 2: reorder pre-existing '! test_grep' to 'test_grep !'
# (must come before steps 3-4 so greplint does not see them)
sed -i 's/! test_grep/test_grep !/' t0031-lockfile-pid.sh
sed -i 's/! test_grep/test_grep !/' t5300-pack-object.sh
sed -i 's/! test_grep/test_grep !/' t5319-multi-pack-index.sh
# Step 3: convert '! grep' -> 'test_grep !'
perl greplint.pl *.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/! *grep/test_grep !/" "$f"
done
# Step 4: convert remaining 'grep' -> 'test_grep'
perl greplint.pl *.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/grep/test_grep/" "$f"
done
To verify, run: make -C t test-greplint
Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
216 lines
6.2 KiB
Bash
Executable File
216 lines
6.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 metadata encoding
|
|
|
|
This test checks that the import process handles inconsistent text
|
|
encoding in p4 metadata (author names, commit messages, etc) without
|
|
failing, and produces maximally sane output in git.'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
###############################
|
|
## SECTION REPEATED IN t9836 ##
|
|
###############################
|
|
|
|
EXTRA_PATH="$(pwd)/temp_python"
|
|
mkdir "$EXTRA_PATH"
|
|
PATH="$EXTRA_PATH:$PATH"
|
|
export PATH
|
|
|
|
# These tests are specific to Python 2. Write a custom script that executes
|
|
# git-p4 directly with the Python 2 interpreter to ensure that we use that
|
|
# version even if Git was compiled with Python 3.
|
|
test_lazy_prereq P4_PYTHON2 '
|
|
python_target_binary=$(which python2) &&
|
|
test -n "$python_target_binary" &&
|
|
write_script "$EXTRA_PATH"/git-p4-python2 <<-EOF &&
|
|
exec "$python_target_binary" "$(git --exec-path)/git-p4" "\$@"
|
|
EOF
|
|
( git p4-python2 || true ) >err &&
|
|
test_grep "valid commands" err
|
|
'
|
|
|
|
if ! test_have_prereq P4_PYTHON2
|
|
then
|
|
skip_all="skipping python2 git p4 tests; python2 not available"
|
|
test_done
|
|
fi
|
|
|
|
remove_user_cache () {
|
|
rm "$HOME/.gitp4-usercache.txt" || true
|
|
}
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot' '
|
|
(
|
|
cd "$cli" &&
|
|
|
|
p4_add_user "utf8_author" "ǣuthor" &&
|
|
P4USER=utf8_author &&
|
|
touch file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "first CL has some utf-8 tǣxt" &&
|
|
|
|
p4_add_user "latin1_author" "$(echo æuthor |
|
|
iconv -f utf8 -t latin1)" &&
|
|
P4USER=latin1_author &&
|
|
touch file2 &&
|
|
p4 add file2 &&
|
|
p4 submit -d "$(echo second CL has some latin-1 tæxt |
|
|
iconv -f utf8 -t latin1)" &&
|
|
|
|
p4_add_user "cp1252_author" "$(echo æuthœr |
|
|
iconv -f utf8 -t cp1252)" &&
|
|
P4USER=cp1252_author &&
|
|
touch file3 &&
|
|
p4 add file3 &&
|
|
p4 submit -d "$(echo third CL has sœme cp-1252 tæxt |
|
|
iconv -f utf8 -t cp1252)" &&
|
|
|
|
p4_add_user "cp850_author" "$(echo Åuthor |
|
|
iconv -f utf8 -t cp850)" &&
|
|
P4USER=cp850_author &&
|
|
touch file4 &&
|
|
p4 add file4 &&
|
|
p4 submit -d "$(echo fourth CL hÅs some cp850 text |
|
|
iconv -f utf8 -t cp850)"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone non-utf8 repo with strict encoding' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
test_must_fail git -c git-p4.metadataDecodingStrategy=strict p4-python2 clone --dest="$git" //depot@all 2>err &&
|
|
test_grep "Decoding perforce metadata failed!" err
|
|
'
|
|
|
|
test_expect_success 'check utf-8 contents with passthrough strategy' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=passthrough p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
test_grep "some utf-8 tǣxt" actual &&
|
|
test_grep "ǣuthor" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check latin-1 contents corrupted in git with passthrough strategy' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=passthrough p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
|
|
test_grep "$badly_encoded_in_git" actual &&
|
|
bad_author_in_git="$(echo æuthor | iconv -f utf8 -t latin1)" &&
|
|
test_grep "$bad_author_in_git" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check utf-8 contents with fallback strategy' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=fallback p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
test_grep "some utf-8 tǣxt" actual &&
|
|
test_grep "ǣuthor" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check latin-1 contents with fallback strategy' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=fallback p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
test_grep "some latin-1 tæxt" actual &&
|
|
test_grep "æuthor" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check cp-1252 contents with fallback strategy' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=fallback p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
test_grep "sœme cp-1252 tæxt" actual &&
|
|
test_grep "æuthœr" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check cp850 contents parsed with correct fallback' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=fallback -c git-p4.metadataFallbackEncoding=cp850 p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
test_grep "hÅs some cp850 text" actual &&
|
|
test_grep "Åuthor" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check cp850-only contents escaped when cp1252 is fallback' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=fallback p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
test_grep "h%8Fs some cp850 text" actual &&
|
|
test_grep "%8Futhor" actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check cp-1252 contents on later sync after clone with fallback strategy' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=fallback p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$cli" &&
|
|
P4USER=cp1252_author &&
|
|
touch file10 &&
|
|
p4 add file10 &&
|
|
p4 submit -d "$(echo later CL has sœme more cp-1252 tæxt |
|
|
iconv -f utf8 -t cp1252)"
|
|
) &&
|
|
(
|
|
cd "$git" &&
|
|
|
|
git p4-python2 sync --branch=master &&
|
|
|
|
git log p4/master >actual &&
|
|
test_grep "sœme more cp-1252 tæxt" actual &&
|
|
test_grep "æuthœr" actual
|
|
)
|
|
'
|
|
|
|
############################
|
|
## / END REPEATED SECTION ##
|
|
############################
|
|
|
|
test_expect_success 'passthrough (latin-1 contents corrupted in git) is the default with python2' '
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished remove_user_cache &&
|
|
git -c git-p4.metadataDecodingStrategy=passthrough p4-python2 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
git log >actual &&
|
|
badly_encoded_in_git=$(echo "some latin-1 tæxt" | iconv -f utf8 -t latin1) &&
|
|
test_grep "$badly_encoded_in_git" actual
|
|
)
|
|
'
|
|
|
|
test_done
|