git-svn testsuite: use standard configuration for Subversion tools
I have tweaked configuration in my ~/.subversion directory, namely I am running auto-properties and automatically adding '$Id$' expansion to every file. This choke the last test named 'proplist' from t9101-git-svn-props.sh, because one more property, svn:keywords is automatically added. I had just wrapped svn invocation with the svn_cmd that specifies empty directory via --config-dir argument. Since the latter is the global option, it should be recognized by all svn subcommands, so no regressions will be introduced. Now svn_cmd is used everywhere, not just in the failed test module: this should guard us from the future clashes with user-defined configuration tweaks. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:

committed by
Eric Wong

parent
065b0702f7
commit
da083d688e
@ -26,6 +26,8 @@ fi
|
||||
|
||||
svnrepo=$PWD/svnrepo
|
||||
export svnrepo
|
||||
svnconf=$PWD/svnconf
|
||||
export svnconf
|
||||
|
||||
perl -w -e "
|
||||
use SVN::Core;
|
||||
@ -54,6 +56,19 @@ poke() {
|
||||
test-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" "$@"
|
||||
}
|
||||
|
||||
for d in \
|
||||
"$SVN_HTTPD_PATH" \
|
||||
/usr/sbin/apache2 \
|
||||
|
Reference in New Issue
Block a user