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
@ -4,12 +4,12 @@ test_description='git svn authorship'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'setup svn repository' '
|
||||
svn checkout "$svnrepo" work.svn &&
|
||||
svn_cmd checkout "$svnrepo" work.svn &&
|
||||
(
|
||||
cd work.svn &&
|
||||
echo >file
|
||||
svn add file
|
||||
svn commit -m "first commit" file
|
||||
svn_cmd add file
|
||||
svn_cmd commit -m "first commit" file
|
||||
)
|
||||
'
|
||||
|
||||
@ -74,10 +74,10 @@ test_expect_success 'interact with it via git svn' '
|
||||
# Make sure there are no svn commit messages with excess blank lines
|
||||
(
|
||||
cd work.svn &&
|
||||
svn up &&
|
||||
svn_cmd up &&
|
||||
|
||||
test $(svn log -r2:2 | wc -l) = 5 &&
|
||||
test $(svn log -r4:4 | wc -l) = 7
|
||||
test $(svn_cmd log -r2:2 | wc -l) = 5 &&
|
||||
test $(svn_cmd log -r4:4 | wc -l) = 7
|
||||
)
|
||||
'
|
||||
|
||||
|
Reference in New Issue
Block a user