global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-27 02:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'win-tests-fixes' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2017-05-09 23:36:42 +02:00
parent f2fcf31301 0c0f3dde11
commit 443f6f9f82
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t0021-conversion.sh
View File

@@ -276,7 +276,7 @@ test_expect_success 'filter that does not read is fine' '
test_cmp expect actual
'
test_expect_success EXPENSIVE 'filter large file' '
test_expect_success EXPENSIVE,!MINGW 'filter large file' '
test_config filter.largefile.smudge cat &&
test_config filter.largefile.clean cat &&
for i in $(test_seq 1 2048); do printf "%1048576d" 1; done >2GB &&

4
t/t0027-auto-crlf.sh
View File

@@ -4,9 +4,9 @@ test_description='CRLF conversion all combinations'
. ./test-lib.sh
if ! test_have_prereq EXPENSIVE
if ! test_have_prereq EXPENSIVE && ! test_have_prereq MINGW
then
skip_all="EXPENSIVE not set"
skip_all="Neither EXPENSIVE nor MINGW set"
test_done
fi

2
t/t0302-credential-store.sh
View File

@@ -37,7 +37,7 @@ helper_test store
unset XDG_CONFIG_HOME
test_expect_success 'if custom xdg file exists, home and xdg files not created' '
test_when_finished "rm -f $HOME/xdg/git/credentials" &&
test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
test -s "$HOME/xdg/git/credentials" &&
test_path_is_missing "$HOME/.git-credentials" &&
test_path_is_missing "$HOME/.config/git/credentials"

8
t/t3900-i18n-commit.sh
View File

@@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because of NULs' '
'
test_expect_success 'UTF-8 invalid characters refused' '
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
echo "UTF-8 characters" >F &&
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
>"$HOME/invalid" &&
@@ -49,7 +49,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
'
test_expect_success 'UTF-8 overlong sequences rejected' '
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
rm -f "$HOME/stderr" "$HOME/invalid" &&
echo "UTF-8 overlong" >F &&
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
@@ -59,7 +59,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
'
test_expect_success 'UTF-8 non-characters refused' '
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
echo "UTF-8 non-character 1" >F &&
printf "Commit message\n\nNon-character:\364\217\277\276\n" \
>"$HOME/invalid" &&
@@ -68,7 +68,7 @@ test_expect_success 'UTF-8 non-characters refused' '
'
test_expect_success 'UTF-8 non-characters refused' '
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
echo "UTF-8 non-character 2." >F &&
printf "Commit message\n\nNon-character:\357\267\220\n" \
>"$HOME/invalid" &&

6
t/t9020-remote-svn.sh
View File

@@ -12,6 +12,12 @@ then
test_done
fi
if test_have_prereq MINGW
then
skip_all='skipping remote-svn tests for lack of POSIX'
test_done
fi
# Override svnrdump with our simulator
PATH="$HOME:$PATH"
export PATH PYTHON_PATH GIT_BUILD_DIR