tests: undo special treatment of CRLF for Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
4d715ac05c
commit
f94ea11cf2
@ -18,10 +18,6 @@ check() {
|
|||||||
cat stderr &&
|
cat stderr &&
|
||||||
false
|
false
|
||||||
fi &&
|
fi &&
|
||||||
if test_have_prereq MINGW
|
|
||||||
then
|
|
||||||
dos2unix -q stderr
|
|
||||||
fi &&
|
|
||||||
test_cmp expect-stdout stdout &&
|
test_cmp expect-stdout stdout &&
|
||||||
test_cmp expect-stderr stderr
|
test_cmp expect-stderr stderr
|
||||||
}
|
}
|
||||||
|
@ -254,10 +254,6 @@ test_expect_success 'ensure "status --cached --recursive" preserves the --cached
|
|||||||
) &&
|
) &&
|
||||||
git submodule status --cached --recursive -- nested1 > ../actual
|
git submodule status --cached --recursive -- nested1 > ../actual
|
||||||
) &&
|
) &&
|
||||||
if test_have_prereq MINGW
|
|
||||||
then
|
|
||||||
dos2unix actual
|
|
||||||
fi &&
|
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ test_expect_success $PREREQ \
|
|||||||
echo do
|
echo do
|
||||||
echo " echo \"!\$a!\""
|
echo " echo \"!\$a!\""
|
||||||
echo "done >commandline\$output"
|
echo "done >commandline\$output"
|
||||||
test_have_prereq MINGW && echo "dos2unix commandline\$output"
|
|
||||||
echo "cat > msgtxt\$output"
|
echo "cat > msgtxt\$output"
|
||||||
) >fake.sendmail &&
|
) >fake.sendmail &&
|
||||||
chmod +x ./fake.sendmail &&
|
chmod +x ./fake.sendmail &&
|
||||||
|
Reference in New Issue
Block a user