mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
fa84058180
Several test scripts run daemons like 'git-daemon' or Apache, and
communicate with them through TCP sockets. To have unique ports where
these daemons are accessible, the ports are usually the number of the
corresponding test scripts, unless the user overrides them via
environment variables, and thus all those tests and test libs contain
more or less the same bit of one-liner boilerplate code to find out
the port. The last patch in this series will make this a bit more
complicated.
Factor out finding the port for a daemon into the common helper
function 'test_set_port' to avoid repeating ourselves.
Take special care of test scripts with "low" numbers:
- Test numbers below 1024 would result in a port that's only usable
as root, so set their port to '10000 + test-nr' to make sure it
doesn't interfere with other tests in the test suite. This makes
the hardcoded port number in 't0410-partial-clone.sh' unnecessary,
remove it.
- The shell's arithmetic evaluation interprets numbers with leading
zeros as octal values, which means that test number below 1000 and
containing the digits 8 or 9 will trigger an error. Remove all
leading zeros from the test numbers to prevent this.
Note that the 'git p4' tests are unlike the other tests involving
daemons in that:
- 'lib-git-p4.sh' doesn't use the test's number for unique port as
is, but does a bit of additional arithmetic on top [1].
- The port is not overridable via an environment variable.
With this patch even 'git p4' tests will use the test's number as
default port, and it will be overridable via the P4DPORT environment
variable.
[1] Commit fc00233071 (git-p4 tests: refactor and cleanup, 2011-08-22)
introduced that "unusual" unique port computation without
explaining why it was necessary (as opposed to simply using the
test number as is). It seems to be just unnecessary complication,
and in any case that commit came way before the "test nr as unique
port" got "standardized" for other daemons in commits c44132fcf3
(tests: auto-set git-daemon port, 2014-02-10), 3bb486e439 (tests:
auto-set LIB_HTTPD_PORT from test name, 2014-02-10), and
bf9d7df950 (t/lib-git-svn.sh: improve svnserve tests with parallel
make test, 2017-12-01).
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
140 lines
2.9 KiB
Bash
140 lines
2.9 KiB
Bash
. ./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}
|
|
|
|
test_tristate GIT_SVN_TEST_HTTPD
|
|
case $GIT_SVN_TEST_HTTPD in
|
|
true)
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
|
LIB_HTTPD_SVN="$loc"
|
|
start_httpd
|
|
;;
|
|
*)
|
|
stop_httpd () {
|
|
: noop
|
|
}
|
|
;;
|
|
esac
|
|
}
|
|
|
|
convert_to_rev_db () {
|
|
perl -w -- - "$@" <<\EOF
|
|
use strict;
|
|
@ARGV == 2 or die "usage: convert_to_rev_db <input> <output>";
|
|
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 % 24) == 0 or die "Inconsistent size: $size";
|
|
while (sysread($rd, my $buf, 24) == 24) {
|
|
my ($r, $c) = unpack('NH40', $buf);
|
|
my $offset = $r * 41;
|
|
seek $wr, 0, 2 or die $!;
|
|
my $pos = tell $wr;
|
|
if ($pos < $offset) {
|
|
for (1 .. (($offset - $pos) / 41)) {
|
|
print $wr (('0' x 40),"\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 () {
|
|
test_tristate GIT_TEST_SVNSERVE
|
|
if ! test "$GIT_TEST_SVNSERVE" = true
|
|
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_a_utf8_locale () {
|
|
a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
|
|
p
|
|
q
|
|
}')
|
|
if test -n "$a_utf8_locale"
|
|
then
|
|
test_set_prereq UTF8
|
|
else
|
|
say "# UTF-8 locale not available, some tests are skipped"
|
|
fi
|
|
}
|