development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-12 11:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ps/chainlint-self-check-update' into maint-2.43

Browse source 
Test framework update.

* ps/chainlint-self-check-update:
  tests: adjust whitespace in chainlint expectations
This commit is contained in:
Junio C Hamano 2024-02-08 16:22:07 -08:00
parent 546f8d2dcd 647b5e0998
commit b1184c3c69
27 changed files with 90 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
t/Makefile
View file

@ -90,20 +90,12 @@ check-chainlint:
echo "# chainlint: $(CHAINLINTTMP_SQ)/tests" && \
for i in $(CHAINLINTTESTS); do \
echo "# chainlint: $$i" && \
sed -e '/^[ ]*$$/d' chainlint/$$i.expect; \
cat chainlint/$$i.expect; \
done \
} >'$(CHAINLINTTMP_SQ)'/expect && \
$(CHAINLINT) --emit-all '$(CHAINLINTTMP_SQ)'/tests | \
sed -e 's/^[1-9][0-9]* //;/^[ ]*$$/d' >'$(CHAINLINTTMP_SQ)'/actual && \
if test -f ../GIT-BUILD-OPTIONS; then \
. ../GIT-BUILD-OPTIONS; \
fi && \
if test -x ../git$$X; then \
DIFFW="../git$$X --no-pager diff -w --no-index"; \
else \
DIFFW="diff -w -u"; \
fi && \
$$DIFFW '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual
sed -e 's/^[1-9][0-9]* //' >'$(CHAINLINTTMP_SQ)'/actual && \
diff -u '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual
test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
test-lint-filenames

8
t/chainlint/blank-line-before-esac.expect
View file

@ -1,11 +1,11 @@
test_done ( ) {
test_done () {
case "$test_failure" in
0 )
0)
test_at_end_hook_
exit 0 ;;
* )
*)
if test $test_external_has_tap -eq 0
then
say_color error "# failed $test_failure among $msg"
@ -14,5 +14,5 @@ test_done ( ) {
exit 1 ;;
esac
esac
}

4
t/chainlint/blank-line.expect
View file

@ -1,4 +1,8 @@
(
nothing &&
something
)

4
t/chainlint/block.expect
View file

@ -12,9 +12,9 @@
) &&
{
echo a ; ?!AMP?! echo b
echo a; ?!AMP?! echo b
} &&
{ echo a ; ?!AMP?! echo b ; } &&
{ echo a; ?!AMP?! echo b; } &&
{
echo "${var}9" &&

4
t/chainlint/chain-break-background.expect
View file

@ -1,9 +1,9 @@
JGIT_DAEMON_PID= &&
git init --bare empty.git &&
> empty.git/git-daemon-export-ok &&
>empty.git/git-daemon-export-ok &&
mkfifo jgit_daemon_output &&
{
jgit daemon --port="$JGIT_DAEMON_PORT" . > jgit_daemon_output &
jgit daemon --port="$JGIT_DAEMON_PORT" . >jgit_daemon_output &
JGIT_DAEMON_PID=$!
} &&
test_expect_code 2 git ls-remote --exit-code git://localhost:$JGIT_DAEMON_PORT/empty.git

14
t/chainlint/chain-break-return-exit.expect
View file

@ -1,16 +1,16 @@
case "$(git ls-files)" in
one ) echo pass one ;;
* ) echo bad one ; return 1 ;;
one) echo pass one ;;
*) echo bad one; return 1 ;;
esac &&
(
case "$(git ls-files)" in
two ) echo pass two ;;
* ) echo bad two ; exit 1 ;;
esac
two) echo pass two ;;
*) echo bad two; exit 1 ;;
esac
) &&
case "$(git ls-files)" in
dir/two"$LF"one ) echo pass both ;;
* ) echo bad ; return 1 ;;
dir/two"$LF"one) echo pass both ;;
*) echo bad; return 1 ;;
esac &&
for i in 1 2 3 4 ; do

4
t/chainlint/chain-break-status.expect
View file

@ -1,7 +1,7 @@
OUT=$(( ( large_git ; echo $? 1 >& 3 ) | : ) 3 >& 1) &&
OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
test_match_signal 13 "$OUT" &&
{ test-tool sigchain > actual ; ret=$? ; } &&
{ test-tool sigchain >actual; ret=$?; } &&
{
test_match_signal 15 "$ret" ||
test "$ret" = 3

4
t/chainlint/chained-subshell.expect
View file

@ -4,7 +4,7 @@ mkdir sub && (
nuff said
) &&
cut "-d " -f actual | ( read s1 s2 s3 &&
cut "-d " -f actual | (read s1 s2 s3 &&
test -f $s1 ?!AMP?!
test $(cat $s2) = tree2path1 &&
test $(cat $s3) = tree3path1 )
test $(cat $s3) = tree3path1)

2
t/chainlint/command-substitution-subsubshell.expect
View file

@ -1,2 +1,2 @@
OUT=$(( ( large_git 1 >& 3 ) | : ) 3 >& 1) &&
OUT=$( ((large_git 1>&3) | :) 3>&1 ) &&
test_match_signal 13 "$OUT"

6
t/chainlint/dqstring-line-splice.expect
View file

@ -1,3 +1,5 @@
echo 'fatal: reword option of --fixup is mutually exclusive with' '--patch/--interactive/--all/--include/--only' > expect &&
test_must_fail git commit --fixup=reword:HEAD~ $1 2 > actual &&
echo 'fatal: reword option of --fixup is mutually exclusive with' '--patch/--interactive/--all/--include/--only' >expect &&
test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&
test_cmp expect actual

5
t/chainlint/dqstring-no-interpolate.expect
View file

@ -6,6 +6,7 @@ grep "^\.git$" output.txt &&
(
cd client$version &&
GIT_TEST_PROTOCOL_VERSION=$version git fetch-pack --no-progress .. $(cat ../input)
) > output &&
cut -d ' ' -f 2 < output | sort > actual &&
) >output &&
cut -d ' ' -f 2 <output | sort >actual &&
test_cmp expect actual

4
t/chainlint/empty-here-doc.expect
View file

@ -1,4 +1,4 @@
git ls-tree $tree path > current &&
cat > expected <<\EOF &&
git ls-tree $tree path >current &&
cat >expected <<\EOF &&
EOF
test_output

2
t/chainlint/exclamation.expect
View file

@ -1,4 +1,4 @@
if ! condition ; then echo nope ; else yep ; fi &&
if ! condition; then echo nope; else yep; fi &&
test_prerequisite !MINGW &&
mail uucp!address &&
echo !whatever!

2
t/chainlint/for-loop-abbreviated.expect
View file

@ -1,5 +1,5 @@
for it
do
path=$(expr "$it" : ( [^:]*) ) &&
path=$(expr "$it" : ([^:]*)) &&
git update-index --add "$path" || exit
done

1
t/chainlint/for-loop.expect
View file

@ -6,6 +6,7 @@
bar
EOF
done ?!AMP?!
for i in a b c; do
echo $i &&
cat $i ?!LOOP?!

4
t/chainlint/function.expect
View file

@ -1,8 +1,8 @@
sha1_file ( ) {
sha1_file() {
echo "$*" | sed "s#..#.git/objects/&/#"
} &&
remove_object ( ) {
remove_object() {
file=$(sha1_file "$*") &&
test -e "$file" ?!AMP?!
rm -f "$file"

4
t/chainlint/here-doc.expect
View file

@ -1,6 +1,6 @@
boodle wobba \
gorgo snoot \
wafta snurb <<EOF &&
gorgo snoot \
wafta snurb <<EOF &&
quoth the raven,
nevermore...
EOF

20
t/chainlint/loop-detect-status.expect
View file

@ -1,18 +1,18 @@
( while test $i -le $blobcount
do
printf "Generating blob $i/$blobcount\r" >& 2 &&
(while test $i -le $blobcount
do
printf "Generating blob $i/$blobcount\r" >&2 &&
printf "blob\nmark :$i\ndata $blobsize\n" &&
#test-tool genrandom $i $blobsize &&
printf "%-${blobsize}s" $i &&
echo "M 100644 :$i $i" >> commit &&
i=$(($i+1)) ||
echo $? > exit-status
done &&
echo "commit refs/heads/main" &&
echo "author A U Thor <author@email.com> 123456789 +0000" &&
echo "committer C O Mitter <committer@email.com> 123456789 +0000" &&
echo "data 5" &&
echo ">2gb" &&
cat commit ) |
done &&
echo "commit refs/heads/main" &&
echo "author A U Thor <author@email.com> 123456789 +0000" &&
echo "committer C O Mitter <committer@email.com> 123456789 +0000" &&
echo "data 5" &&
echo ">2gb" &&
cat commit) |
git fast-import --big-file-threshold=2 &&
test ! -f exit-status

6
t/chainlint/nested-cuddled-subshell.expect
View file

@ -2,18 +2,24 @@
(cd foo &&
bar
) &&
(cd foo &&
bar
) ?!AMP?!
(
cd foo &&
bar) &&
(
cd foo &&
bar) ?!AMP?!
(cd foo &&
bar) &&
(cd foo &&
bar) ?!AMP?!
foobar
)

24
t/chainlint/nested-loop-detect-failure.expect
View file

@ -1,31 +1,31 @@
for i in 0 1 2 3 4 5 6 7 8 9 ;
for i in 0 1 2 3 4 5 6 7 8 9;
do
for j in 0 1 2 3 4 5 6 7 8 9 ;
for j in 0 1 2 3 4 5 6 7 8 9;
do
echo "$i$j" > "path$i$j" ?!LOOP?!
echo "$i$j" >"path$i$j" ?!LOOP?!
done ?!LOOP?!
done &&
for i in 0 1 2 3 4 5 6 7 8 9 ;
for i in 0 1 2 3 4 5 6 7 8 9;
do
for j in 0 1 2 3 4 5 6 7 8 9 ;
for j in 0 1 2 3 4 5 6 7 8 9;
do
echo "$i$j" > "path$i$j" || return 1
echo "$i$j" >"path$i$j" || return 1
done
done &&
for i in 0 1 2 3 4 5 6 7 8 9 ;
for i in 0 1 2 3 4 5 6 7 8 9;
do
for j in 0 1 2 3 4 5 6 7 8 9 ;
for j in 0 1 2 3 4 5 6 7 8 9;
do
echo "$i$j" > "path$i$j" ?!LOOP?!
echo "$i$j" >"path$i$j" ?!LOOP?!
done || return 1
done &&
for i in 0 1 2 3 4 5 6 7 8 9 ;
for i in 0 1 2 3 4 5 6 7 8 9;
do
for j in 0 1 2 3 4 5 6 7 8 9 ;
for j in 0 1 2 3 4 5 6 7 8 9;
do
echo "$i$j" > "path$i$j" || return 1
echo "$i$j" >"path$i$j" || return 1
done || return 1
done

1
t/chainlint/nested-subshell.expect
View file

@ -4,6 +4,7 @@
echo a &&
echo b
) >file &&
cd foo &&
(
echo a ?!AMP?!

2
t/chainlint/pipe.expect
View file

@ -2,7 +2,9 @@
foo |
bar |
baz &&
fish |
cow ?!AMP?!
sunder
)

4
t/chainlint/subshell-here-doc.expect
View file

@ -1,7 +1,7 @@
(
echo wobba \
gorgo snoot \
wafta snurb <<-EOF &&
gorgo snoot \
wafta snurb <<-EOF &&
quoth the raven,
nevermore...
EOF

5
t/chainlint/subshell-one-liner.expect
View file

@ -2,13 +2,18 @@
(foo && bar) &&
(foo && bar) |
(foo && bar) >baz &&
(foo; ?!AMP?! bar) &&
(foo; ?!AMP?! bar) |
(foo; ?!AMP?! bar) >baz &&
(foo || exit 1) &&
(foo || exit 1) |
(foo || exit 1) >baz &&
(foo && bar) ?!AMP?!
(foo && bar; ?!AMP?! baz) ?!AMP?!
foobar
)

1
t/chainlint/t7900-subtree.expect
View file

@ -15,6 +15,7 @@ main-sub4" &&
$chkms
TXT
) &&
subfiles=$(git ls-files) &&
check_equal "$subfiles" "$chkms
$chks"

14
t/chainlint/token-pasting.expect
View file

@ -4,22 +4,22 @@ git config filter.rot13.clean ./rot13.sh &&
{
echo "*.t filter=rot13" ?!AMP?!
echo "*.i ident"
} > .gitattributes &&
} >.gitattributes &&
{
echo a b c d e f g h i j k l m ?!AMP?!
echo n o p q r s t u v w x y z ?!AMP?!
echo '$Id$'
} > test &&
cat test > test.t &&
cat test > test.o &&
cat test > test.i &&
} >test &&
cat test >test.t &&
cat test >test.o &&
cat test >test.i &&
git add test test.t test.i &&
rm -f test test.t test.i &&
git checkout -- test test.t test.i &&
echo "content-test2" > test2.o &&
echo "content-test3 - filename with special characters" > "test3 'sq',$x=.o" ?!AMP?!
echo "content-test2" >test2.o &&
echo "content-test3 - filename with special characters" >"test3 'sq',$x=.o" ?!AMP?!
downstream_url_for_sed=$(
printf "%sn" "$downstream_url" |

1
t/chainlint/while-loop.expect
View file

@ -6,6 +6,7 @@
bar
EOF
done ?!AMP?!
while true; do
echo foo &&
cat bar ?!LOOP?!