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. See14d30cdfc0(ref-filter: fix memory leak in `free_array_item()`, 2019-07-10),c514c62a4f(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 my6798b08e84(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'sde004e848a(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>
		
			
				
	
	
		
			150 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Bash
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Bash
		
	
	
	
	
	
if test -z "$TEST_FAILS_SANITIZE_LEAK"
 | 
						|
then
 | 
						|
	TEST_PASSES_SANITIZE_LEAK=true
 | 
						|
fi
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
if test -n "$NO_SVN_TESTS"
 | 
						|
then
 | 
						|
	skip_all='skipping git svn tests, NO_SVN_TESTS defined'
 | 
						|
	test_done
 | 
						|
fi
 | 
						|
if ! test_have_prereq PERL; then
 | 
						|
	skip_all='skipping git svn tests, perl not available'
 | 
						|
	test_done
 | 
						|
fi
 | 
						|
 | 
						|
GIT_DIR=$PWD/.git
 | 
						|
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
 | 
						|
SVN_TREE=$GIT_SVN_DIR/svn-tree
 | 
						|
test_set_port SVNSERVE_PORT
 | 
						|
 | 
						|
svn >/dev/null 2>&1
 | 
						|
if test $? -ne 1
 | 
						|
then
 | 
						|
	skip_all='skipping git svn tests, svn not found'
 | 
						|
	test_done
 | 
						|
fi
 | 
						|
 | 
						|
svnrepo=$PWD/svnrepo
 | 
						|
export svnrepo
 | 
						|
svnconf=$PWD/svnconf
 | 
						|
export svnconf
 | 
						|
 | 
						|
perl -w -e "
 | 
						|
use SVN::Core;
 | 
						|
use SVN::Repos;
 | 
						|
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
 | 
						|
system(qw/svnadmin create --fs-type fsfs/, \$ENV{svnrepo}) == 0 or exit(41);
 | 
						|
" >&3 2>&4
 | 
						|
x=$?
 | 
						|
if test $x -ne 0
 | 
						|
then
 | 
						|
	if test $x -eq 42; then
 | 
						|
		skip_all='Perl SVN libraries must be >= 1.1.0'
 | 
						|
	elif test $x -eq 41; then
 | 
						|
		skip_all='svnadmin failed to create fsfs repository'
 | 
						|
	else
 | 
						|
		skip_all='Perl SVN libraries not found or unusable'
 | 
						|
	fi
 | 
						|
	test_done
 | 
						|
fi
 | 
						|
 | 
						|
rawsvnrepo="$svnrepo"
 | 
						|
svnrepo="file://$svnrepo"
 | 
						|
 | 
						|
poke() {
 | 
						|
	test-tool chmtime +1 "$1"
 | 
						|
}
 | 
						|
 | 
						|
# We need this, because we should pass empty configuration directory to
 | 
						|
# the 'svn commit' to avoid automated property changes and other stuff
 | 
						|
# that could be set from user's configuration files in ~/.subversion.
 | 
						|
svn_cmd () {
 | 
						|
	[ -d "$svnconf" ] || mkdir "$svnconf"
 | 
						|
	orig_svncmd="$1"; shift
 | 
						|
	if [ -z "$orig_svncmd" ]; then
 | 
						|
		svn
 | 
						|
		return
 | 
						|
	fi
 | 
						|
	svn "$orig_svncmd" --config-dir "$svnconf" "$@"
 | 
						|
}
 | 
						|
 | 
						|
maybe_start_httpd () {
 | 
						|
	loc=${1-svn}
 | 
						|
 | 
						|
	if test_bool_env GIT_TEST_SVN_HTTPD false
 | 
						|
	then
 | 
						|
		. "$TEST_DIRECTORY"/lib-httpd.sh
 | 
						|
		LIB_HTTPD_SVN="$loc"
 | 
						|
		start_httpd
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
convert_to_rev_db () {
 | 
						|
	perl -w -- - "$(test_oid rawsz)" "$@" <<\EOF
 | 
						|
use strict;
 | 
						|
my $oidlen = shift;
 | 
						|
@ARGV == 2 or die "usage: convert_to_rev_db <input> <output>";
 | 
						|
my $record_size = $oidlen + 4;
 | 
						|
my $hexlen = $oidlen * 2;
 | 
						|
open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";
 | 
						|
open my $rd, '<', $ARGV[0] or die "$!: couldn't open: $ARGV[0]";
 | 
						|
my $size = (stat($rd))[7];
 | 
						|
($size % $record_size) == 0 or die "Inconsistent size: $size";
 | 
						|
while (sysread($rd, my $buf, $record_size) == $record_size) {
 | 
						|
	my ($r, $c) = unpack("NH$hexlen", $buf);
 | 
						|
	my $offset = $r * ($hexlen + 1);
 | 
						|
	seek $wr, 0, 2 or die $!;
 | 
						|
	my $pos = tell $wr;
 | 
						|
	if ($pos < $offset) {
 | 
						|
		for (1 .. (($offset - $pos) / ($hexlen + 1))) {
 | 
						|
			print $wr (('0' x $hexlen),"\n") or die $!;
 | 
						|
		}
 | 
						|
	}
 | 
						|
	seek $wr, $offset, 0 or die $!;
 | 
						|
	print $wr $c,"\n" or die $!;
 | 
						|
}
 | 
						|
close $wr or die $!;
 | 
						|
close $rd or die $!;
 | 
						|
EOF
 | 
						|
}
 | 
						|
 | 
						|
require_svnserve () {
 | 
						|
	if ! test_bool_env GIT_TEST_SVNSERVE false
 | 
						|
	then
 | 
						|
		skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
 | 
						|
		test_done
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
start_svnserve () {
 | 
						|
	svnserve --listen-port $SVNSERVE_PORT \
 | 
						|
		 --root "$rawsvnrepo" \
 | 
						|
		 --listen-once \
 | 
						|
		 --listen-host 127.0.0.1 &
 | 
						|
}
 | 
						|
 | 
						|
prepare_utf8_locale () {
 | 
						|
	if test -z "$GIT_TEST_UTF8_LOCALE"
 | 
						|
	then
 | 
						|
		case "${LC_ALL:-$LANG}" in
 | 
						|
		*.[Uu][Tt][Ff]8 | *.[Uu][Tt][Ff]-8)
 | 
						|
			GIT_TEST_UTF8_LOCALE="${LC_ALL:-$LANG}"
 | 
						|
			;;
 | 
						|
		*)
 | 
						|
			GIT_TEST_UTF8_LOCALE=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
 | 
						|
				p
 | 
						|
				q
 | 
						|
			}')
 | 
						|
			;;
 | 
						|
		esac
 | 
						|
	fi
 | 
						|
	if test -n "$GIT_TEST_UTF8_LOCALE"
 | 
						|
	then
 | 
						|
		test_set_prereq UTF8
 | 
						|
	else
 | 
						|
		say "# UTF-8 locale not available, some tests are skipped"
 | 
						|
	fi
 | 
						|
}
 |