2008-10-30 09:49:26 +03:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2008 Eric Wong
|
|
|
|
|
|
|
|
test_description='git svn honors i18n.commitEncoding in config'
|
|
|
|
|
revisions API: have release_revisions() release "cmdline"
Extend the the release_revisions() function so that it frees the
"cmdline" in the "struct rev_info". This in combination with a
preceding change to free "commits" and "mailmap" means that we can
whitelist another test under "TEST_PASSES_SANITIZE_LEAK=true".
There was a proposal in [1] to do away with xstrdup()-ing this
add_rev_cmdline(), perhaps that would be worthwhile, but for now let's
just free() it.
We could also make that a "char *" in "struct rev_cmdline_entry"
itself, but since we own it let's expose it as a constant to outside
callers. I proposed that in [2] but have since changed my mind. See
14d30cdfc04 (ref-filter: fix memory leak in `free_array_item()`,
2019-07-10), c514c62a4fd (checkout: fix leak of non-existent branch
names, 2020-08-14) and other log history hits for "free((char *)" for
prior art.
This includes the tests we had false-positive passes on before my
6798b08e848 (perl Git.pm: don't ignore signalled failure in
_cmd_close(), 2022-02-01), now they pass for real.
Since there are 66 tests matching t/t[0-9]*git-svn*.sh it's easier to
list those that don't pass than to touch most of those 66. So let's
introduce a "TEST_FAILS_SANITIZE_LEAK=true", which if set in the tests
won't cause lib-git-svn.sh to set "TEST_PASSES_SANITIZE_LEAK=true.
This change also marks all the tests that we removed
"TEST_FAILS_SANITIZE_LEAK=true" from in an earlier commit due to
removing the UNLEAK() from cmd_format_patch(), we can now assert that
its API use doesn't leak any "struct rev_info" memory.
This change also made commit "t5503-tagfollow.sh" pass on current
master, but that would regress when combined with
ps/fetch-atomic-fixup's de004e848a9 (t5503: simplify setup of test
which exercises failure of backfill, 2022-03-03) (through no fault of
that topic, that change started using "git clone" in the test, which
has an outstanding leak). Let's leave that test out for now to avoid
in-flight semantic conflicts.
1. https://lore.kernel.org/git/YUj%2FgFRh6pwrZalY@carlos-mbp.lan/
2. https://lore.kernel.org/git/87o88obkb1.fsf@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13 23:01:47 +03:00
|
|
|
TEST_FAILS_SANITIZE_LEAK=true
|
2008-10-30 09:49:26 +03:00
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
compare_git_head_with () {
|
2016-01-12 14:49:28 +03:00
|
|
|
nr=$(wc -l < "$1")
|
2008-10-30 09:49:26 +03:00
|
|
|
a=7
|
|
|
|
b=$(($a + $nr - 1))
|
|
|
|
git cat-file commit HEAD | sed -ne "$a,${b}p" >current &&
|
|
|
|
test_cmp current "$1"
|
|
|
|
}
|
|
|
|
|
t: use user-specified utf-8 locale for testing svn
In some test-cases, UTF-8 locale is required. To find such locale,
we're using the first available UTF-8 locale that returned by
"locale -a".
However, the locale(1) utility is unavailable on some systems,
e.g. Linux with musl libc.
However, without "locale -a", we can't guess provided UTF-8 locale.
Add a Makefile knob GIT_TEST_UTF8_LOCALE and activate it for
linux-musl in our CI system.
Rename t/lib-git-svn.sh:prepare_a_utf8_locale to prepare_utf8_locale,
since we no longer prepare the variable named "a_utf8_locale",
but set up a fallback value for GIT_TEST_UTF8_LOCALE instead.
The fallback will be LC_ALL, LANG environment variable,
or the first UTF-8 locale from output of "locale -a", in that order.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-06-08 09:56:28 +03:00
|
|
|
prepare_utf8_locale
|
2010-06-02 23:15:48 +04:00
|
|
|
|
2008-10-30 09:49:26 +03:00
|
|
|
compare_svn_head_with () {
|
2009-01-18 09:11:44 +03:00
|
|
|
# extract just the log message and strip out committer info.
|
|
|
|
# don't use --limit here since svn 1.1.x doesn't have it,
|
t: use user-specified utf-8 locale for testing svn
In some test-cases, UTF-8 locale is required. To find such locale,
we're using the first available UTF-8 locale that returned by
"locale -a".
However, the locale(1) utility is unavailable on some systems,
e.g. Linux with musl libc.
However, without "locale -a", we can't guess provided UTF-8 locale.
Add a Makefile knob GIT_TEST_UTF8_LOCALE and activate it for
linux-musl in our CI system.
Rename t/lib-git-svn.sh:prepare_a_utf8_locale to prepare_utf8_locale,
since we no longer prepare the variable named "a_utf8_locale",
but set up a fallback value for GIT_TEST_UTF8_LOCALE instead.
The fallback will be LC_ALL, LANG environment variable,
or the first UTF-8 locale from output of "locale -a", in that order.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-06-08 09:56:28 +03:00
|
|
|
LC_ALL="$GIT_TEST_UTF8_LOCALE" svn log $(git svn info --url) | perl -w -e '
|
2009-01-18 09:11:44 +03:00
|
|
|
use bytes;
|
|
|
|
$/ = ("-"x72) . "\n";
|
|
|
|
my @x = <STDIN>;
|
|
|
|
@x = split(/\n/, $x[1]);
|
|
|
|
splice(@x, 0, 2);
|
|
|
|
$x[-1] = "";
|
|
|
|
print join("\n", @x);
|
|
|
|
' > current &&
|
2008-10-30 09:49:26 +03:00
|
|
|
test_cmp current "$1"
|
|
|
|
}
|
|
|
|
|
2009-05-19 03:44:38 +04:00
|
|
|
for H in ISO8859-1 eucJP ISO-2022-JP
|
2008-10-30 09:49:26 +03:00
|
|
|
do
|
|
|
|
test_expect_success "$H setup" '
|
|
|
|
mkdir $H &&
|
2009-05-08 12:06:16 +04:00
|
|
|
svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
|
2008-10-30 09:49:26 +03:00
|
|
|
git svn clone "$svnrepo"/$H $H
|
|
|
|
'
|
|
|
|
done
|
|
|
|
|
2009-05-19 03:44:38 +04:00
|
|
|
for H in ISO8859-1 eucJP ISO-2022-JP
|
2008-10-30 09:49:26 +03:00
|
|
|
do
|
|
|
|
test_expect_success "$H commit on git side" '
|
|
|
|
(
|
|
|
|
cd $H &&
|
|
|
|
git config i18n.commitencoding $H &&
|
|
|
|
git checkout -b t refs/remotes/git-svn &&
|
|
|
|
echo $H >F &&
|
|
|
|
git add F &&
|
|
|
|
git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
|
|
|
|
E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
|
2018-07-02 03:24:04 +03:00
|
|
|
test "z$E" = "z$H" &&
|
2008-10-30 09:49:26 +03:00
|
|
|
compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
|
|
|
|
)
|
|
|
|
'
|
|
|
|
done
|
|
|
|
|
2009-05-19 03:44:38 +04:00
|
|
|
for H in ISO8859-1 eucJP ISO-2022-JP
|
2008-10-30 09:49:26 +03:00
|
|
|
do
|
|
|
|
test_expect_success "$H dcommit to svn" '
|
|
|
|
(
|
|
|
|
cd $H &&
|
|
|
|
git svn dcommit &&
|
|
|
|
git cat-file commit HEAD | grep git-svn-id: &&
|
|
|
|
E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
|
|
|
|
test "z$E" = "z$H" &&
|
|
|
|
compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
|
|
|
|
)
|
|
|
|
'
|
|
|
|
done
|
|
|
|
|
2009-02-24 23:13:39 +03:00
|
|
|
test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '
|
2008-10-30 09:49:26 +03:00
|
|
|
(
|
2009-05-19 03:44:38 +04:00
|
|
|
cd ISO8859-1 &&
|
2008-12-23 04:09:24 +03:00
|
|
|
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
2008-10-30 09:49:26 +03:00
|
|
|
)
|
2009-02-24 23:13:39 +03:00
|
|
|
'
|
2008-12-23 04:09:24 +03:00
|
|
|
|
2009-05-19 03:44:38 +04:00
|
|
|
for H in eucJP ISO-2022-JP
|
2009-02-24 23:13:39 +03:00
|
|
|
do
|
|
|
|
test_expect_success UTF8 "$H should match UTF-8 in svn" '
|
2008-12-23 04:09:24 +03:00
|
|
|
(
|
|
|
|
cd $H &&
|
|
|
|
compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
|
|
|
|
)
|
2009-02-24 23:13:39 +03:00
|
|
|
'
|
|
|
|
done
|
2008-10-30 09:49:26 +03:00
|
|
|
|
|
|
|
test_done
|