Skip to content

Commit

Permalink
git-svn: update tests for recent changes
Browse files Browse the repository at this point in the history
* Enable test for delta transfers in full-svn-test.

* Run tests against the root of the repository so we won't have
  to revisit 308906f and
  efe4631 again.
  The graft-branches test still runs as before.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Nov 28, 2006
1 parent 27a1a80 commit e151611
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion t/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ clean:

# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
full-svn-test:
$(MAKE) $(TSVN) GIT_SVN_NO_LIB=0 GIT_SVN_DELTA_FETCH=1 \
GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
$(MAKE) $(TSVN) GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
$(MAKE) $(TSVN) GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
$(MAKE) $(TSVN) GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
LC_ALL=en_US.UTF-8
$(MAKE) $(TSVN) GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
Expand Down
2 changes: 1 addition & 1 deletion t/lib-git-svn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ else
svnadmin create "$svnrepo"
fi

svnrepo="file://$svnrepo/test-git-svn"
svnrepo="file://$svnrepo"


5 changes: 5 additions & 0 deletions t/t9100-git-svn-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,11 @@ tree 56a30b966619b863674f5978696f4a3594f2fca9
tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
EOF

if test -z "$GIT_SVN_NO_LIB" || test "$GIT_SVN_NO_LIB" -eq 0; then
echo tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 >> expected
fi

test_expect_success "$name" "diff -u a expected"

test_done
2 changes: 2 additions & 0 deletions t/t9103-git-svn-graft-branches.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
test_description='git-svn graft-branches'
. ./lib-git-svn.sh

svnrepo="$svnrepo/test-git-svn"

test_expect_success 'initialize repo' "
mkdir import &&
cd import &&
Expand Down

0 comments on commit e151611

Please sign in to comment.