Fix tests breaking when checkout path contains shell metacharacters
This fixes the remainder of the issues where the test script itself is at fault for failing when the git checkout path contains whitespace or other shell metacharacters. The majority of git svn tests used the idiom test_expect_success "title" "test script using $svnrepo" These were changed to have the test script in single-quotes: test_expect_success "title" 'test script using "$svnrepo"' which unfortunately makes the patch appear larger than it really is. One consequence of this change is that in the verbose test output the value of $svnrepo (and in some cases other variables, too) is no longer expanded, i.e. previously we saw * expecting success: test script using /path/to/git/t/trash/svnrepo but now it is: * expecting success: test script using "$svnrepo" Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
0e46e70462
commit
f69e836fab
@ -13,43 +13,43 @@ rm -r .git
|
||||
mkdir tmp
|
||||
cd tmp
|
||||
|
||||
test_expect_success 'setup svnrepo' "
|
||||
test_expect_success 'setup svnrepo' '
|
||||
mkdir project project/trunk project/branches project/tags &&
|
||||
echo foo > project/trunk/foo &&
|
||||
svn import -m '$test_description' project $svnrepo/project &&
|
||||
svn import -m "$test_description" project "$svnrepo"/project &&
|
||||
rm -rf project
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'basic clone' "
|
||||
test_expect_success 'basic clone' '
|
||||
test ! -d trunk &&
|
||||
git svn clone $svnrepo/project/trunk &&
|
||||
git svn clone "$svnrepo"/project/trunk &&
|
||||
test -d trunk/.git/svn &&
|
||||
test -e trunk/foo &&
|
||||
rm -rf trunk
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'clone to target directory' "
|
||||
test_expect_success 'clone to target directory' '
|
||||
test ! -d target &&
|
||||
git svn clone $svnrepo/project/trunk target &&
|
||||
git svn clone "$svnrepo"/project/trunk target &&
|
||||
test -d target/.git/svn &&
|
||||
test -e target/foo &&
|
||||
rm -rf target
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'clone with --stdlayout' "
|
||||
test_expect_success 'clone with --stdlayout' '
|
||||
test ! -d project &&
|
||||
git svn clone -s $svnrepo/project &&
|
||||
git svn clone -s "$svnrepo"/project &&
|
||||
test -d project/.git/svn &&
|
||||
test -e project/foo &&
|
||||
rm -rf project
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'clone to target directory with --stdlayout' "
|
||||
test_expect_success 'clone to target directory with --stdlayout' '
|
||||
test ! -d target &&
|
||||
git svn clone -s $svnrepo/project target &&
|
||||
git svn clone -s "$svnrepo"/project target &&
|
||||
test -d target/.git/svn &&
|
||||
test -e target/foo &&
|
||||
rm -rf target
|
||||
"
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Reference in New Issue
Block a user