mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-19 16:55:31 -05:00
cd352cab5b
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.
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:
# Step 1: mark bare greps that should not be converted
sed -i '/! grep "$m" \.git\/packed-refs/s/$/ # lint-ok: file may not exist (reftable)/' \
t/t1400-update-ref.sh
sed -i '/! grep dirty file3 &&/{/lint-ok/!s/$/ # lint-ok: file may not exist after --quit/}' \
t/t3420-rebase-autostash.sh
sed -i '/grep -vf before commits\.raw/s/$/ # lint-ok: data filter/' \
t/t5326-multi-pack-bitmaps.sh
sed -i '/! grep $d shallow-client\/\.git\/shallow/s/$/ # lint-ok: file may not exist after repack/' \
t/t5537-fetch-shallow.sh
sed -i '/grep -E "^\[0-9a-f\].*|| :/s/$/ # lint-ok: data filter/' \
t/t5702-protocol-v2.sh
sed -i '/! grep gitdir squatting-clone/s/$/ # lint-ok: file may not exist after failed clone/' \
t/t7450-bad-git-dotfiles.sh
# 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 !/' t/t0031-lockfile-pid.sh
sed -i 's/! test_grep/test_grep !/' t/t5300-pack-object.sh
sed -i 's/! test_grep/test_grep !/' t/t5319-multi-pack-index.sh
# Step 3: convert '! grep' -> 'test_grep !'
perl t/greplint.pl t/*.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 t/greplint.pl t/*.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>
123 lines
3.3 KiB
Bash
Executable File
123 lines
3.3 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Johannes E. Schindelin
|
|
#
|
|
|
|
test_description='Test custom diff function name patterns'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
# a non-trivial custom pattern
|
|
git config diff.custom1.funcname "!static
|
|
!String
|
|
[^ ].*s.*" &&
|
|
|
|
# a custom pattern which matches to end of line
|
|
git config diff.custom2.funcname "......Beer\$" &&
|
|
|
|
# alternation in pattern
|
|
git config diff.custom3.funcname "Beer$" &&
|
|
git config diff.custom3.xfuncname "^[ ]*((public|static).*)$" &&
|
|
|
|
# for regexp compilation tests
|
|
echo A >A.java &&
|
|
echo B >B.java
|
|
'
|
|
|
|
test_expect_success 'setup: test-tool userdiff' '
|
|
# Make sure additions to builtin_drivers are sorted
|
|
test_when_finished "rm builtin-drivers.sorted" &&
|
|
test-tool userdiff list-builtin-drivers >builtin-drivers &&
|
|
test_file_not_empty builtin-drivers &&
|
|
sort <builtin-drivers >builtin-drivers.sorted &&
|
|
test_cmp builtin-drivers.sorted builtin-drivers &&
|
|
|
|
# Ditto, but "custom" requires the .git directory and config
|
|
# to be setup and read.
|
|
test_when_finished "rm custom-drivers.sorted" &&
|
|
test-tool userdiff list-custom-drivers >custom-drivers &&
|
|
test_file_not_empty custom-drivers &&
|
|
sort <custom-drivers >custom-drivers.sorted &&
|
|
test_cmp custom-drivers.sorted custom-drivers
|
|
'
|
|
|
|
diffpatterns="
|
|
$(cat builtin-drivers)
|
|
$(cat custom-drivers)
|
|
"
|
|
|
|
for p in $diffpatterns
|
|
do
|
|
test_expect_success "builtin $p pattern compiles" '
|
|
echo "*.java diff=$p" >.gitattributes &&
|
|
test_expect_code 1 git diff --no-index \
|
|
A.java B.java 2>msg &&
|
|
test_grep ! fatal msg &&
|
|
test_grep ! error msg
|
|
'
|
|
test_expect_success "builtin $p wordRegex pattern compiles" '
|
|
echo "*.java diff=$p" >.gitattributes &&
|
|
test_expect_code 1 git diff --no-index --word-diff \
|
|
A.java B.java 2>msg &&
|
|
test_grep ! fatal msg &&
|
|
test_grep ! error msg
|
|
'
|
|
|
|
test_expect_success "builtin $p pattern compiles on bare repo with --attr-source" '
|
|
test_when_finished "rm -rf bare.git" &&
|
|
git checkout -B master &&
|
|
git add . &&
|
|
echo "*.java diff=notexist" >.gitattributes &&
|
|
git add .gitattributes &&
|
|
git commit -am "changing gitattributes" &&
|
|
git checkout -B branchA &&
|
|
echo "*.java diff=$p" >.gitattributes &&
|
|
git add .gitattributes &&
|
|
git commit -am "changing gitattributes" &&
|
|
git clone --bare --no-local . bare.git &&
|
|
git -C bare.git symbolic-ref HEAD refs/heads/master &&
|
|
test_expect_code 1 git -C bare.git --attr-source=branchA \
|
|
diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
|
|
test_grep ! fatal msg &&
|
|
test_grep ! error msg
|
|
'
|
|
done
|
|
|
|
test_expect_success 'last regexp must not be negated' '
|
|
echo "*.java diff=java" >.gitattributes &&
|
|
test_config diff.java.funcname "!static" &&
|
|
test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
|
|
test_grep ": Last expression must not be negated:" msg
|
|
'
|
|
|
|
test_expect_success 'setup hunk header tests' '
|
|
for i in $diffpatterns
|
|
do
|
|
echo "$i-* diff=$i" || return 1
|
|
done > .gitattributes &&
|
|
|
|
# add all test files to the index
|
|
(
|
|
cd "$TEST_DIRECTORY"/t4018 &&
|
|
git --git-dir="$TRASH_DIRECTORY/.git" add .
|
|
) &&
|
|
|
|
# place modified files in the worktree
|
|
for i in $(git ls-files)
|
|
do
|
|
sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
|
|
done
|
|
'
|
|
|
|
# check each individual file
|
|
for i in $(git ls-files)
|
|
do
|
|
test_expect_success "hunk header: $i" "
|
|
git diff -U1 $i >actual &&
|
|
test_grep '@@ .* @@.*RIGHT' actual
|
|
"
|
|
done
|
|
|
|
test_done
|