2006-07-06 07:14:16 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2008-09-08 10:02:05 +00:00
|
|
|
remotes_git_svn=remotes/git""-svn
|
|
|
|
git_svn_id=git""-svn-id
|
|
|
|
|
2006-07-06 07:14:16 +00:00
|
|
|
if test -n "$NO_SVN_TESTS"
|
2006-05-24 02:23:41 +00:00
|
|
|
then
|
2010-06-24 17:44:48 +00:00
|
|
|
skip_all='skipping git svn tests, NO_SVN_TESTS defined'
|
2006-07-06 07:14:16 +00:00
|
|
|
test_done
|
2006-05-24 02:23:41 +00:00
|
|
|
fi
|
2009-04-03 19:33:59 +00:00
|
|
|
if ! test_have_prereq PERL; then
|
2010-06-24 17:44:48 +00:00
|
|
|
skip_all='skipping git svn tests, perl not available'
|
2009-04-03 19:33:59 +00:00
|
|
|
test_done
|
|
|
|
fi
|
2006-05-24 02:23:41 +00:00
|
|
|
|
2006-12-16 07:58:07 +00:00
|
|
|
GIT_DIR=$PWD/.git
|
2009-08-12 03:14:27 +00:00
|
|
|
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
|
2006-12-16 07:58:07 +00:00
|
|
|
SVN_TREE=$GIT_SVN_DIR/svn-tree
|
|
|
|
|
2006-05-24 02:23:41 +00:00
|
|
|
svn >/dev/null 2>&1
|
2006-07-07 10:17:16 +00:00
|
|
|
if test $? -ne 1
|
2006-05-24 02:23:41 +00:00
|
|
|
then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all='skipping git svn tests, svn not found'
|
2006-05-24 02:23:41 +00:00
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
|
|
|
svnrepo=$PWD/svnrepo
|
2008-05-04 05:37:57 +00:00
|
|
|
export svnrepo
|
2009-05-08 08:06:16 +00:00
|
|
|
svnconf=$PWD/svnconf
|
|
|
|
export svnconf
|
2006-05-24 02:23:41 +00:00
|
|
|
|
2010-08-10 12:14:25 +00:00
|
|
|
"$PERL_PATH" -w -e "
|
2007-01-01 05:49:45 +00:00
|
|
|
use SVN::Core;
|
|
|
|
use SVN::Repos;
|
|
|
|
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
|
2008-05-04 05:37:57 +00:00
|
|
|
system(qw/svnadmin create --fs-type fsfs/, \$ENV{svnrepo}) == 0 or exit(41);
|
2007-01-14 08:22:47 +00:00
|
|
|
" >&3 2>&4
|
2007-01-01 05:49:45 +00:00
|
|
|
x=$?
|
|
|
|
if test $x -ne 0
|
git-svn: SVN 1.1.x library compatibility
Tested on a plain Ubuntu Hoary installation
using subversion 1.1.1-2ubuntu3
1.1.x issues I had to deal with:
* Avoid the noisy command-line client compatibility check if we
use the libraries.
* get_log() arguments differ (now using a nice wrapper from
Junio's suggestion)
* get_file() is picky about what kind of file handles it gets,
so I ended up redirecting STDOUT. I'm probably overflushing
my file handles, but that's the safest thing to do...
* BDB kept segfaulting on me during tests, so svnadmin will use FSFS
whenever we can.
* If somebody used an expanded CVS $Id$ line inside a file, then
propsetting it to use svn:keywords will cause the original CVS
$Id$ to be retained when asked for the original file. As far as
I can see, this is a server-side issue. We won't care in the
test anymore, as long as it's not expanded by SVN, a static
CVS $Id$ line is fine.
While we're at making ourselves more compatible, avoid grep
along with the -q flag, which is GNU-specific. (grep avoidance
tip from Junio, too)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:07:14 +00:00
|
|
|
then
|
2007-01-01 05:49:45 +00:00
|
|
|
if test $x -eq 42; then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all='Perl SVN libraries must be >= 1.1.0'
|
2007-01-13 10:47:53 +00:00
|
|
|
elif test $x -eq 41; then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all='svnadmin failed to create fsfs repository'
|
2007-01-01 05:49:45 +00:00
|
|
|
else
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all='Perl SVN libraries not found or unusable'
|
2007-01-01 05:49:45 +00:00
|
|
|
fi
|
|
|
|
test_done
|
git-svn: SVN 1.1.x library compatibility
Tested on a plain Ubuntu Hoary installation
using subversion 1.1.1-2ubuntu3
1.1.x issues I had to deal with:
* Avoid the noisy command-line client compatibility check if we
use the libraries.
* get_log() arguments differ (now using a nice wrapper from
Junio's suggestion)
* get_file() is picky about what kind of file handles it gets,
so I ended up redirecting STDOUT. I'm probably overflushing
my file handles, but that's the safest thing to do...
* BDB kept segfaulting on me during tests, so svnadmin will use FSFS
whenever we can.
* If somebody used an expanded CVS $Id$ line inside a file, then
propsetting it to use svn:keywords will cause the original CVS
$Id$ to be retained when asked for the original file. As far as
I can see, this is a server-side issue. We won't care in the
test anymore, as long as it's not expanded by SVN, a static
CVS $Id$ line is fine.
While we're at making ourselves more compatible, avoid grep
along with the -q flag, which is GNU-specific. (grep avoidance
tip from Junio, too)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:07:14 +00:00
|
|
|
fi
|
|
|
|
|
2006-12-05 05:17:38 +00:00
|
|
|
rawsvnrepo="$svnrepo"
|
2006-11-28 05:46:50 +00:00
|
|
|
svnrepo="file://$svnrepo"
|
2006-05-24 02:23:41 +00:00
|
|
|
|
2007-02-13 00:33:37 +00:00
|
|
|
poke() {
|
2007-02-25 00:59:52 +00:00
|
|
|
test-chmtime +1 "$1"
|
2007-02-13 00:33:37 +00:00
|
|
|
}
|
2007-07-16 04:53:50 +00:00
|
|
|
|
2009-05-08 08:06:16 +00:00
|
|
|
# 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" "$@"
|
|
|
|
}
|
|
|
|
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
prepare_httpd () {
|
2010-12-14 18:22:29 +00:00
|
|
|
for d in \
|
|
|
|
"$SVN_HTTPD_PATH" \
|
|
|
|
/usr/sbin/apache2 \
|
|
|
|
/usr/sbin/httpd \
|
|
|
|
; do
|
|
|
|
if test -f "$d"
|
|
|
|
then
|
|
|
|
SVN_HTTPD_PATH="$d"
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
2010-12-14 18:25:11 +00:00
|
|
|
if test -z "$SVN_HTTPD_PATH"
|
|
|
|
then
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
echo >&2 '*** error: Apache not found'
|
|
|
|
return 1
|
2010-12-14 18:25:11 +00:00
|
|
|
fi
|
2010-12-14 18:22:29 +00:00
|
|
|
for d in \
|
|
|
|
"$SVN_HTTPD_MODULE_PATH" \
|
|
|
|
/usr/lib/apache2/modules \
|
|
|
|
/usr/libexec/apache2 \
|
|
|
|
; do
|
|
|
|
if test -d "$d"
|
|
|
|
then
|
|
|
|
SVN_HTTPD_MODULE_PATH="$d"
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
2010-12-14 18:25:11 +00:00
|
|
|
if test -z "$SVN_HTTPD_MODULE_PATH"
|
|
|
|
then
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
echo >&2 '*** error: Apache module dir not found'
|
|
|
|
return 1
|
2007-07-16 04:53:50 +00:00
|
|
|
fi
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
if test ! -f "$SVN_HTTPD_MODULE_PATH/mod_dav_svn.so"
|
2008-05-11 00:14:49 +00:00
|
|
|
then
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
echo >&2 '*** error: Apache module "mod_dav_svn" not found'
|
|
|
|
return 1
|
2008-05-11 00:14:49 +00:00
|
|
|
fi
|
2007-07-16 04:53:50 +00:00
|
|
|
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
repo_base_path="${1-svn}"
|
2007-07-16 04:53:50 +00:00
|
|
|
mkdir "$GIT_DIR"/logs
|
|
|
|
|
|
|
|
cat > "$GIT_DIR/httpd.conf" <<EOF
|
2008-09-08 10:02:08 +00:00
|
|
|
ServerName "git svn test"
|
2007-07-16 04:53:50 +00:00
|
|
|
ServerRoot "$GIT_DIR"
|
|
|
|
DocumentRoot "$GIT_DIR"
|
|
|
|
PidFile "$GIT_DIR/httpd.pid"
|
2008-03-21 07:27:35 +00:00
|
|
|
LockFile logs/accept.lock
|
2007-07-16 04:53:50 +00:00
|
|
|
Listen 127.0.0.1:$SVN_HTTPD_PORT
|
|
|
|
LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
|
|
|
|
LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
|
2008-05-11 00:14:49 +00:00
|
|
|
<Location /$repo_base_path>
|
2007-07-16 04:53:50 +00:00
|
|
|
DAV svn
|
2008-07-14 09:13:56 +00:00
|
|
|
SVNPath "$rawsvnrepo"
|
2007-07-16 04:53:50 +00:00
|
|
|
</Location>
|
|
|
|
EOF
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
start_httpd () {
|
|
|
|
if test -z "$SVN_HTTPD_PORT"
|
|
|
|
then
|
|
|
|
echo >&2 'SVN_HTTPD_PORT is not defined!'
|
|
|
|
return
|
|
|
|
fi
|
|
|
|
|
|
|
|
prepare_httpd "$1" || return 1
|
|
|
|
|
2007-07-16 04:53:50 +00:00
|
|
|
"$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
|
2008-05-11 00:14:49 +00:00
|
|
|
svnrepo="http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path"
|
2007-07-16 04:53:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
stop_httpd () {
|
|
|
|
test -z "$SVN_HTTPD_PORT" && return
|
lib-git-svn.sh: Move web-server handling code into separate function
This library file is currently sourced by 57 test files, of which
only four may (optionally) start a web-server in order to access
the svn repo via an http url, rather than a file url.
In addition to isolating the current web-server handling code from
the majority of tests, in a new prepare_httpd function, we also
add some more error checking and reporting code to validate the
apache installation. Only those tests which attempt to start the
web-server, by calling start_httpd, will execute this code.
Note that it is important for start_httpd to return an error
indication, if prepare_httpd fails, so that the failure to use
the web-server, as requested by the user, should not go unnoticed.
(Unless the svnrepo variable is set to an http url at the end of
start_httpd, the remaining tests will use file urls, without
comment.)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-30 19:44:48 +00:00
|
|
|
test ! -f "$GIT_DIR/httpd.conf" && return
|
2007-07-16 04:53:50 +00:00
|
|
|
"$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k stop
|
|
|
|
}
|
2007-12-09 07:27:41 +00:00
|
|
|
|
|
|
|
convert_to_rev_db () {
|
2010-08-10 12:14:25 +00:00
|
|
|
"$PERL_PATH" -w -- - "$@" <<\EOF
|
2007-12-09 07:27:41 +00:00
|
|
|
use strict;
|
2013-02-24 22:48:39 +00:00
|
|
|
@ARGV == 2 or die "usage: convert_to_rev_db <input> <output>";
|
2007-12-09 07:27:41 +00:00
|
|
|
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
|
|
|
|
}
|
2008-09-14 21:14:15 +00:00
|
|
|
|
|
|
|
require_svnserve () {
|
|
|
|
if test -z "$SVNSERVE_PORT"
|
|
|
|
then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)'
|
2008-09-14 21:14:15 +00:00
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
start_svnserve () {
|
|
|
|
svnserve --listen-port $SVNSERVE_PORT \
|
|
|
|
--root "$rawsvnrepo" \
|
|
|
|
--listen-once \
|
|
|
|
--listen-host 127.0.0.1 &
|
|
|
|
}
|
|
|
|
|