mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
git-svn: t/t91??-*: optimize the tests a bit
This removes some unnecessary 'svn up' calls throughout t9103-git-svn-graft-branches.sh: * removed an 'svn log' call that was leftover from debugging * removed multiple git-svn calls with a multi-init / multi-fetch combination (which weren't tested before, either) * replaced `rev-list ... | head -n1` with `rev-parse ...` (not sure what I was thinking when I wrote that) All this saves about 9 seconds from a test run (53s -> 44s for 'make t91*') on my 1.3GHz Athlon Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
5bd3870c37
commit
4385355454
|
@ -57,13 +57,10 @@ test_expect_success 'setup some commits to svn' \
|
|||
'cd test_wc &&
|
||||
echo Greetings >> kw.c &&
|
||||
svn commit -m "Not yet an Id" &&
|
||||
svn up &&
|
||||
echo Hello world >> kw.c &&
|
||||
svn commit -m "Modified file, but still not yet an Id" &&
|
||||
svn up &&
|
||||
svn propset svn:keywords Id kw.c &&
|
||||
svn commit -m "Propset Id" &&
|
||||
svn up &&
|
||||
svn commit -m "Propset Id"
|
||||
cd ..'
|
||||
|
||||
test_expect_success 'initialize git-svn' "git-svn init $svnrepo"
|
||||
|
@ -86,8 +83,7 @@ test_expect_success "propset CR on crlf files" \
|
|||
svn propset svn:eol-style CR empty &&
|
||||
svn propset svn:eol-style CR crlf &&
|
||||
svn propset svn:eol-style CR ne_crlf &&
|
||||
svn commit -m "propset CR on crlf files" &&
|
||||
svn up &&
|
||||
svn commit -m "propset CR on crlf files"
|
||||
cd ..'
|
||||
|
||||
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
|
||||
|
@ -111,8 +107,7 @@ cd test_wc
|
|||
svn propset svn:eol-style CRLF ne_cr &&
|
||||
svn propset svn:keywords Id cr &&
|
||||
svn propset svn:keywords Id ne_cr &&
|
||||
svn commit -m "propset CRLF on cr files" &&
|
||||
svn up'
|
||||
svn commit -m "propset CRLF on cr files"'
|
||||
cd ..
|
||||
test_expect_success 'fetch and pull latest from svn' \
|
||||
'git-svn fetch && git pull . remotes/git-svn'
|
||||
|
|
|
@ -16,25 +16,19 @@ test_expect_success 'initialize repo' "
|
|||
cd wc &&
|
||||
echo feedme >> branches/a/readme &&
|
||||
svn commit -m hungry &&
|
||||
svn up &&
|
||||
cd trunk &&
|
||||
svn merge -r3:4 $svnrepo/branches/a &&
|
||||
svn commit -m 'merge with a' &&
|
||||
cd ../.. &&
|
||||
svn log -v $svnrepo &&
|
||||
git-svn init -i trunk $svnrepo/trunk &&
|
||||
git-svn init -i a $svnrepo/branches/a &&
|
||||
git-svn init -i tags/a $svnrepo/tags/a &&
|
||||
git-svn fetch -i tags/a &&
|
||||
git-svn fetch -i a &&
|
||||
git-svn fetch -i trunk
|
||||
git-svn multi-init $svnrepo -T trunk -b branches -t tags &&
|
||||
git-svn multi-fetch
|
||||
"
|
||||
|
||||
r1=`git-rev-list remotes/trunk | tail -n1`
|
||||
r2=`git-rev-list remotes/tags/a | tail -n1`
|
||||
r3=`git-rev-list remotes/a | tail -n1`
|
||||
r4=`git-rev-list remotes/a | head -n1`
|
||||
r5=`git-rev-list remotes/trunk | head -n1`
|
||||
r4=`git-rev-parse remotes/a`
|
||||
r5=`git-rev-parse remotes/trunk`
|
||||
|
||||
test_expect_success 'test graft-branches regexes and copies' "
|
||||
test -n "$r1" &&
|
||||
|
|
|
@ -17,7 +17,6 @@ test_expect_success 'initialize repo' "
|
|||
cd wc &&
|
||||
echo world >> trunk/readme &&
|
||||
svn commit -m 'another commit' &&
|
||||
svn up &&
|
||||
svn mv -m 'rename to thunk' trunk thunk &&
|
||||
svn up &&
|
||||
echo goodbye >> thunk/readme &&
|
||||
|
|
Loading…
Reference in a new issue