Skip to content

Commit

Permalink
Teach t0027 about native end-of-lines
Browse files Browse the repository at this point in the history
Without this patch, t0027 expects the native end-of-lines to be a single
line feed character. On Windows, however, we set it to a carriage return
character followed by a line feed character. Thus, we have to modify
t0027 to expect different warnings depending on the end-of-line markers.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Apr 1, 2015
1 parent 25423b2 commit c07cae2
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions t/t0027-auto-crlf.sh
Expand Up @@ -55,11 +55,17 @@ create_gitattributes () {
esac
}

# Some warnings depend on the native end-of-line marker

test_have_prereq NATIVE_CRLF &&
NATIVE_CRLF=t ||
NATIVE_CRLF=

check_warning () {
case "$1" in
LF_CRLF) grep "LF will be replaced by CRLF" $2;;
CRLF_LF) grep "CRLF will be replaced by LF" $2;;
'')
case "$1,$NATIVE_CRLF" in
LF_CRLF,*|MAYBE_CRLF,t|MIX,t) grep "LF will be replaced by CRLF" $2;;
CRLF_LF,*|MAYBE_LF,|MIX,) grep "CRLF will be replaced by LF" $2;;
,*|MAYBE_CRLF,|MAYBE_LF,t)
>expect
grep "will be replaced by" $2 >actual
test_cmp expect actual
Expand Down Expand Up @@ -175,16 +181,17 @@ test_expect_success 'add files empty attr' '
create_file_in_repo input "" "" "CRLF_LF" "CRLF_LF" "" ""
'


test_expect_success 'add files attr=auto' '
create_file_in_repo false "auto" "" "CRLF_LF" "CRLF_LF" "" "" &&
create_file_in_repo true "auto" "LF_CRLF" "" "LF_CRLF" "" "" &&
create_file_in_repo input "auto" "" "CRLF_LF" "CRLF_LF" "" ""
create_file_in_repo false "auto" "MAYBE_CRLF" "MAYBE_LF" "MIX" "" "" &&
create_file_in_repo true "auto" "LF_CRLF" "" "LF_CRLF" "" "" &&
create_file_in_repo input "auto" "" "CRLF_LF" "CRLF_LF" "" ""
'

test_expect_success 'add files attr=text' '
create_file_in_repo false "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" &&
create_file_in_repo true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" &&
create_file_in_repo input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
create_file_in_repo false "text" "MAYBE_CRLF" "MAYBE_LF" "MIX" "MAYBE_CRLF" "MAYBE_LF" &&
create_file_in_repo true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" &&
create_file_in_repo input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
'

test_expect_success 'add files attr=-text' '
Expand Down

0 comments on commit c07cae2

Please sign in to comment.