Merge branch 'tb/dedup-crlf-tests'
* tb/dedup-crlf-tests: t0027: tests are not expensive; remove t0025
This commit is contained in:
Junio C Hamano
commit
d13686ff4d
@ -1,181 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
test_description='CRLF conversion'
|
|
||||||
|
|
||||||
. ./test-lib.sh
|
|
||||||
|
|
||||||
has_cr() {
|
|
||||||
tr '\015' Q <"$1" | grep Q >/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
test_expect_success setup '
|
|
||||||
|
|
||||||
git config core.autocrlf false &&
|
|
||||||
|
|
||||||
for w in Hello world how are you; do echo $w; done >LFonly &&
|
|
||||||
for w in I am very very fine thank you; do echo ${w}Q; done | q_to_cr >CRLFonly &&
|
|
||||||
for w in Oh here is a QNUL byte how alarming; do echo ${w}; done | q_to_nul >LFwithNUL &&
|
|
||||||
git add . &&
|
|
||||||
|
|
||||||
git commit -m initial &&
|
|
||||||
|
|
||||||
LFonly=$(git rev-parse HEAD:LFonly) &&
|
|
||||||
CRLFonly=$(git rev-parse HEAD:CRLFonly) &&
|
|
||||||
LFwithNUL=$(git rev-parse HEAD:LFwithNUL) &&
|
|
||||||
|
|
||||||
echo happy.
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'default settings cause no changes' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
! has_cr LFonly &&
|
|
||||||
has_cr CRLFonly &&
|
|
||||||
LFonlydiff=$(git diff LFonly) &&
|
|
||||||
CRLFonlydiff=$(git diff CRLFonly) &&
|
|
||||||
LFwithNULdiff=$(git diff LFwithNUL) &&
|
|
||||||
test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'crlf=true causes a CRLF file to be normalized' '
|
|
||||||
|
|
||||||
# Backwards compatibility check
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
echo "CRLFonly crlf" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
# Note, "normalized" means that git will normalize it if added
|
|
||||||
has_cr CRLFonly &&
|
|
||||||
CRLFonlydiff=$(git diff CRLFonly) &&
|
|
||||||
test -n "$CRLFonlydiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'text=true causes a CRLF file to be normalized' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
echo "CRLFonly text" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
# Note, "normalized" means that git will normalize it if added
|
|
||||||
has_cr CRLFonly &&
|
|
||||||
CRLFonlydiff=$(git diff CRLFonly) &&
|
|
||||||
test -n "$CRLFonlydiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=false' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git config core.autocrlf false &&
|
|
||||||
echo "LFonly eol=crlf" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
has_cr LFonly &&
|
|
||||||
LFonlydiff=$(git diff LFonly) &&
|
|
||||||
test -z "$LFonlydiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=input' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git config core.autocrlf input &&
|
|
||||||
echo "LFonly eol=crlf" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
has_cr LFonly &&
|
|
||||||
LFonlydiff=$(git diff LFonly) &&
|
|
||||||
test -z "$LFonlydiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'eol=lf gives a normalized file LFs with autocrlf=true' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git config core.autocrlf true &&
|
|
||||||
echo "LFonly eol=lf" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
! has_cr LFonly &&
|
|
||||||
LFonlydiff=$(git diff LFonly) &&
|
|
||||||
test -z "$LFonlydiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'autocrlf=true does not normalize CRLF files' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git config core.autocrlf true &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
has_cr LFonly &&
|
|
||||||
has_cr CRLFonly &&
|
|
||||||
LFonlydiff=$(git diff LFonly) &&
|
|
||||||
CRLFonlydiff=$(git diff CRLFonly) &&
|
|
||||||
LFwithNULdiff=$(git diff LFwithNUL) &&
|
|
||||||
test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'text=auto, autocrlf=true does not normalize CRLF files' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git config core.autocrlf true &&
|
|
||||||
echo "* text=auto" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
has_cr LFonly &&
|
|
||||||
has_cr CRLFonly &&
|
|
||||||
LFonlydiff=$(git diff LFonly) &&
|
|
||||||
CRLFonlydiff=$(git diff CRLFonly) &&
|
|
||||||
LFwithNULdiff=$(git diff LFwithNUL) &&
|
|
||||||
test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'text=auto, autocrlf=true does not normalize binary files' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
git config core.autocrlf true &&
|
|
||||||
echo "* text=auto" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
! has_cr LFwithNUL &&
|
|
||||||
LFwithNULdiff=$(git diff LFwithNUL) &&
|
|
||||||
test -z "$LFwithNULdiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'eol=crlf _does_ normalize binary files' '
|
|
||||||
|
|
||||||
rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
|
|
||||||
echo "LFwithNUL eol=crlf" > .gitattributes &&
|
|
||||||
git read-tree --reset -u HEAD &&
|
|
||||||
|
|
||||||
has_cr LFwithNUL &&
|
|
||||||
LFwithNULdiff=$(git diff LFwithNUL) &&
|
|
||||||
test -z "$LFwithNULdiff"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'prepare unnormalized' '
|
|
||||||
> .gitattributes &&
|
|
||||||
git config core.autocrlf false &&
|
|
||||||
printf "LINEONE\nLINETWO\r\n" >mixed &&
|
|
||||||
git add mixed .gitattributes &&
|
|
||||||
git commit -m "Add mixed" &&
|
|
||||||
git ls-files --eol | egrep "i/crlf" &&
|
|
||||||
git ls-files --eol | egrep "i/mixed"
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'normalize unnormalized' '
|
|
||||||
echo "* text=auto" >.gitattributes &&
|
|
||||||
rm .git/index &&
|
|
||||||
git add . &&
|
|
||||||
git commit -m "Introduce end-of-line normalization" &&
|
|
||||||
git ls-files --eol | tr "\\t" " " | sort >act &&
|
|
||||||
cat >exp <<EOF &&
|
|
||||||
i/-text w/-text attr/text=auto LFwithNUL
|
|
||||||
i/lf w/crlf attr/text=auto CRLFonly
|
|
||||||
i/lf w/crlf attr/text=auto LFonly
|
|
||||||
i/lf w/lf attr/text=auto .gitattributes
|
|
||||||
i/lf w/mixed attr/text=auto mixed
|
|
||||||
EOF
|
|
||||||
test_cmp exp act
|
|
||||||
'
|
|
||||||
|
|
||||||
test_done
|
|
||||||
@ -4,12 +4,6 @@ test_description='CRLF conversion all combinations'
|
|||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if ! test_have_prereq EXPENSIVE
|
|
||||||
then
|
|
||||||
skip_all="EXPENSIVE not set"
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
compare_files () {
|
compare_files () {
|
||||||
tr '\015\000' QN <"$1" >"$1".expect &&
|
tr '\015\000' QN <"$1" >"$1".expect &&
|
||||||
tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual &&
|
tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual &&
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user