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>

diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 5543b07f16d54bb5aa6fab6ab9cde79837a3e68b..46fcec50a5271d80464d7f37e5d402b1a3c0b6d0 100755 (executable)
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -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" &&
        '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" &&
                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 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"
        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 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' \
         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 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'
 cd ..
 test_expect_success 'fetch and pull latest from svn' \
        'git-svn fetch && git pull . remotes/git-svn'

diff --git a/t/t9103-git-svn-graft-branches.sh b/t/t9103-git-svn-graft-branches.sh
index 293b98f92850375aa3223b6af85461a22cd151ea..b5f76770213a99f22a66441aebdc94fcd85070a7 100755 (executable)
--- a/t/t9103-git-svn-graft-branches.sh
+++ b/t/t9103-git-svn-graft-branches.sh
@@ -16,25 +16,19 @@ test_expect_success 'initialize repo' "
        cd wc &&
        echo feedme >> branches/a/readme &&
        svn commit -m hungry &&
        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 ../.. &&
        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`
        "
 
 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" &&
 
 test_expect_success 'test graft-branches regexes and copies' "
        test -n "$r1" &&

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 8d2e2fec395a328f4bf6a65af3c7eba5a98cc133..400c21cd49b6307eeef6d4d25cb34e612b1d0a71 100755 (executable)
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -17,7 +17,6 @@ test_expect_success 'initialize repo' "
        cd wc &&
        echo world >> trunk/readme &&
        svn commit -m 'another commit' &&
        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 &&
        svn mv -m 'rename to thunk' trunk thunk &&
        svn up &&
        echo goodbye >> thunk/readme &&