diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-13 11:34:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-13 11:34:52 -0800 |
| commit | 4b297df9b2c0d91a8593bc026dc70553511cd09b (patch) | |
| tree | 4676336e722d3769a1f67be54ff9805d78738c95 | |
| parent | 4f93fc745ab4f51339ffb3b0e49a5f28a4c2a337 (diff) | |
| parent | 0316bba80f496100ec1706f8d9feb071f20d100c (diff) | |
| download | git-4b297df9b2c0d91a8593bc026dc70553511cd09b.tar.gz | |
Merge branch 'jn/t9010-work-around-broken-svnadmin'
* jn/t9010-work-around-broken-svnadmin:
t9010: svnadmin can fail even if available
| -rwxr-xr-x | t/t9010-svn-fe.sh | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh index c96bf2f5c0..88a9751dd3 100755 --- a/t/t9010-svn-fe.sh +++ b/t/t9010-svn-fe.sh @@ -4,22 +4,6 @@ test_description='check svn dumpfile importer' . ./test-lib.sh -if ! svnadmin -h >/dev/null 2>&1 -then - skip_all='skipping svn-fe tests, svn not available' - test_done -fi - -svnconf=$PWD/svnconf -export svnconf - -svn_cmd () { - subcommand=$1 && - shift && - mkdir -p "$svnconf" && - svn "$subcommand" --config-dir "$svnconf" "$@" -} - reinit_git () { rm -fr .git && git init @@ -41,10 +25,21 @@ test_expect_success 'v3 dumps not supported' ' test_cmp empty stream ' -test_expect_success 't9135/svn.dump' ' - svnadmin create simple-svn && - svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" && - svn_cmd export "file://$PWD/simple-svn" simple-svnco && +test_expect_success 'set up svn repo' ' + svnconf=$PWD/svnconf && + mkdir -p "$svnconf" && + + if + svnadmin -h >/dev/null 2>&1 && + svnadmin create simple-svn && + svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" && + svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco + then + test_set_prereq SVNREPO + fi +' + +test_expect_success SVNREPO 't9135/svn.dump' ' git init simple-git && test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe && ( |