From ab3d175f87767c377cd65a06d96c50a316a28e30 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 29 Oct 2009 16:26:20 +0100 Subject: Make t9150 and t9151 test scripts executable so that they can be run individually as (cd t && ./t9150-svk-mergetickets.sh) etc. just like all other test scripts. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- t/t9150-svk-mergetickets.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 t/t9150-svk-mergetickets.sh (limited to 't/t9150-svk-mergetickets.sh') diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 15c6bf0df4d9f060b5cae7a9a899dc3601c54353 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 30 Oct 2009 16:10:17 -0400 Subject: t915{0,1}: use $TEST_DIRECTORY Because --root can put our trash directories elsewhere, using ".." may not always work. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t9150-svk-mergetickets.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 't/t9150-svk-mergetickets.sh') diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh index 8000c347b4..dd0c2bad24 100755 --- a/t/t9150-svk-mergetickets.sh +++ b/t/t9150-svk-mergetickets.sh @@ -8,7 +8,8 @@ test_description='git-svn svk merge tickets' . ./lib-git-svn.sh test_expect_success 'load svk depot' " - svnadmin load -q '$rawsvnrepo' < '../t9150/svk-merge.dump' && + svnadmin load -q '$rawsvnrepo' \ + < '$TEST_DIRECTORY/t9150/svk-merge.dump' && git svn init --minimize-url -R svkmerge \ -T trunk -b branches '$svnrepo' && git svn fetch --all -- cgit v1.2.3 From 5d59a4016bdc068cd49e2a1c43caf4fa59896391 Mon Sep 17 00:00:00 2001 From: Matthew Ogilvie Date: Sat, 28 Nov 2009 11:38:55 -0700 Subject: t3409 t4107 t7406 t9150: use dashless commands This is needed to allow test suite to run against a standard install bin directory instead of GIT_EXEC_PATH. Signed-off-by: Matthew Ogilvie Signed-off-by: Junio C Hamano --- t/t9150-svk-mergetickets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t9150-svk-mergetickets.sh') diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh index dd0c2bad24..53581425c4 100755 --- a/t/t9150-svk-mergetickets.sh +++ b/t/t9150-svk-mergetickets.sh @@ -18,7 +18,7 @@ test_expect_success 'load svk depot' " uuid=b48289b2-9c08-4d72-af37-0358a40b9c15 test_expect_success 'svk merges were represented coming in' " - [ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ] + [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ] " test_done -- cgit v1.2.3