kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/mingw-test-fixes-around-perl' into next 

Correct tests that depend on Perl running on MinGW

* js/mingw-test-fixes-around-perl:
  t9129: skip UTF-8 tests on Windows
  t9700: accommodate for MSYS2 Perl reporting as `cygwin`
next
Junio C Hamano 2026-09-13 21:56:05 -07:00
parent fb3c42e1d9 aa40ca0217
commit c797ae17e4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t9129-git-svn-i18n-commitencoding.sh
View File

@ -71,7 +71,7 @@ do
'
done

test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '
test_expect_success UTF8,!MINGW 'ISO-8859-1 should match UTF-8 in svn' '
(
cd ISO8859-1 &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
@ -80,7 +80,7 @@ test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '

for H in eucJP ISO-2022-JP
do
test_expect_success UTF8 "$H should match UTF-8 in svn" '
test_expect_success UTF8,!MINGW "$H should match UTF-8 in svn" '
(
cd $H &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt

2
t/t9700/test.pl
View File

@ -118,7 +118,7 @@ unlink $tmpfile;

# paths
my $abs_git_dir = $abs_repo_dir . "/.git";
if ($^O eq 'msys') {
if (defined $ENV{MSYSTEM} && $ENV{MSYSTEM} ne 'MSYS') {
$abs_git_dir = `cygpath -am "$abs_repo_dir/.git"`;
$abs_git_dir =~ s/\r?\n?$//;
}