mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn testsuite: use standard configuration for Subversion tools

Browse Source 
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:
Eygene Ryabinkin
2009-05-08 12:06:16 +04:00
committed by Eric Wong
parent 065b0702f7
commit da083d688e
29 changed files with 221 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
t/t9124-git-svn-dcommit-auto-props.sh
View File

@ -21,7 +21,7 @@ test_expect_success 'initialize git svn' '
(
cd import &&
echo foo >foo &&
svn import -m "import for git svn" . "$svnrepo"
svn_cmd import -m "import for git svn" . "$svnrepo"
) &&
rm -rf import &&
git svn init "$svnrepo"
@ -61,23 +61,23 @@ test_expect_success 'check resulting svn repository' '
(
mkdir work &&
cd work &&
svn co "$svnrepo" &&
svn_cmd co "$svnrepo" &&
cd svnrepo &&
# Check properties from first commit.
test "x$(svn propget svn:executable exec1.sh)" = "x*" &&
test "x$(svn propget svn:mime-type exec1.sh)" = \
test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" &&
test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \
"xapplication/x-shellscript" &&
test "x$(svn propget svn:mime-type hello.txt)" = "xtext/plain" &&
test "x$(svn propget svn:eol-style hello.txt)" = "xnative" &&
test "x$(svn propget svn:mime-type bar)" = "x" &&
test "x$(svn_cmd propget svn:mime-type hello.txt)" = "xtext/plain" &&
test "x$(svn_cmd propget svn:eol-style hello.txt)" = "xnative" &&
test "x$(svn_cmd propget svn:mime-type bar)" = "x" &&
# Check properties from second commit.
test "x$(svn propget svn:executable exec2.sh)" = "x*" &&
test "x$(svn propget svn:mime-type exec2.sh)" = "x" &&
test "x$(svn propget svn:mime-type world.txt)" = "x" &&
test "x$(svn propget svn:eol-style world.txt)" = "x" &&
test "x$(svn propget svn:mime-type zot)" = "x"
test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*" &&
test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" &&
test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" &&
test "x$(svn_cmd propget svn:eol-style world.txt)" = "x" &&
test "x$(svn_cmd propget svn:mime-type zot)" = "x"
)
'
@ -89,12 +89,12 @@ test_expect_success 'check renamed file' '
git svn dcommit --config-dir=user &&
(
cd work/svnrepo &&
svn up &&
svn_cmd up &&
test ! -e foo &&
test -e foo.sh &&
test "x$(svn propget svn:mime-type foo.sh)" = \
test "x$(svn_cmd propget svn:mime-type foo.sh)" = \
"xapplication/x-shellscript" &&
test "x$(svn propget svn:eol-style foo.sh)" = "xLF"
test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
)
'