t0027: Adapt the new MIX tests to Windows
The new MIX tests don't pass under Windows, adapt them to use the correct native line ending. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Torsten Bögershausen committed
Dec 8, 2017 at 18:46 UTC
649f1f0948a4ba7efbaa00f2cb0ff3ddec08a423
1 file changed
+9
-8
t/t0027-auto-crlf.sh
+9
-8
@@ -170,22 +170,22 @@ commit_MIX_chkwrn () {
170
git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err"
171
done
172
173
- test_expect_success "commit file with mixed EOL crlf=$crlf attr=$attr LF" '
173
+ test_expect_success "commit file with mixed EOL onto LF crlf=$crlf attr=$attr" '
174
check_warning "$lfwarn" ${pfx}_LF.err
175
'
176
- test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf CRLF" '
176
+ test_expect_success "commit file with mixed EOL onto CLRF attr=$attr aeol=$aeol crlf=$crlf" '
177
check_warning "$crlfwarn" ${pfx}_CRLF.err
178
'
179
180
- test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf CRLF_mix_LF" '
180
+ test_expect_success "commit file with mixed EOL onto CRLF_mix_LF attr=$attr aeol=$aeol crlf=$crlf" '
181
check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
182
'
183
184
- test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf LF_mix_cr" '
184
+ test_expect_success "commit file with mixed EOL onto LF_mix_cr attr=$attr aeol=$aeol crlf=$crlf " '
185
check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
186
'
187
188
- test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf CRLF_nul" '
188
+ test_expect_success "commit file with mixed EOL onto CRLF_nul attr=$attr aeol=$aeol crlf=$crlf" '
189
check_warning "$crlfnul" ${pfx}_CRLF_nul.err
190
'
191
}
@@ -378,7 +378,7 @@ test_expect_success 'setup master' '
378
printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\rLINETHREE" >CRLF_mix_CR &&
379
printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONEQ\r\nLINETWO\r\nLINETHREE" | q_to_nul >CRLF_nul &&
380
printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONEQ\nLINETWO\nLINETHREE" | q_to_nul >LF_nul &&
381
- create_NNO_MIX_files CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF &&
381
+ create_NNO_MIX_files &&
382
git -c core.autocrlf=false add NNO_*.txt MIX_*.txt &&
383
git commit -m "mixed line endings" &&
384
test_tick
@@ -441,13 +441,14 @@ test_expect_success 'commit files attr=crlf' '
441
'
442
443
# Commit "CRLFmixLF" on top of these files already in the repo:
444
-# LF, CRLF, CRLFmixLF LF_mix_CR CRLFNULL
444
+# mixed mixed mixed mixed mixed
445
+# onto onto onto onto onto
446
# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL
447
commit_MIX_chkwrn "" "" false "" "" "" "" ""
448
commit_MIX_chkwrn "" "" true "LF_CRLF" "" "" "LF_CRLF" "LF_CRLF"
449
commit_MIX_chkwrn "" "" input "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF"
450
450
-commit_MIX_chkwrn "auto" "" false "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF"
451
+commit_MIX_chkwrn "auto" "" false "$WAMIX" "" "" "$WAMIX" "$WAMIX"
452
commit_MIX_chkwrn "auto" "" true "LF_CRLF" "" "" "LF_CRLF" "LF_CRLF"
453
commit_MIX_chkwrn "auto" "" input "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF"
454