From 06eaaa783c9ba36ac45143eaa3b707f804d377a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 13 Aug 2010 20:40:13 +0000 Subject: t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change this test to declare a PERL prerequisite. These tests use the -p switch, so they implicitly depend on Perl code, but nothing was declaring this. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t9602-cvsimport-branches-tags.sh | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 't/t9602-cvsimport-branches-tags.sh') diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh index 67878b2d0..89da4aead 100755 --- a/t/t9602-cvsimport-branches-tags.sh +++ b/t/t9602-cvsimport-branches-tags.sh @@ -6,70 +6,72 @@ test_description='git cvsimport handling of branches and tags' . ./lib-cvs.sh -CVSROOT="$TEST_DIRECTORY"/t9602/cvsroot -export CVSROOT +test_expect_success PERL 'setup CVSROOT' ' + CVSROOT="$TEST_DIRECTORY"/t9602/cvsroot && + export CVSROOT +' -test_expect_success 'import module' ' +test_expect_success PERL 'import module' ' git cvsimport -C module-git module ' -test_expect_success 'test branch master' ' +test_expect_success PERL 'test branch master' ' test_cmp_branch_tree master ' -test_expect_success 'test branch vendorbranch' ' +test_expect_success PERL 'test branch vendorbranch' ' test_cmp_branch_tree vendorbranch ' -test_expect_failure 'test branch B_FROM_INITIALS' ' +test_expect_failure PERL 'test branch B_FROM_INITIALS' ' test_cmp_branch_tree B_FROM_INITIALS ' -test_expect_failure 'test branch B_FROM_INITIALS_BUT_ONE' ' +test_expect_failure PERL 'test branch B_FROM_INITIALS_BUT_ONE' ' test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE ' -test_expect_failure 'test branch B_MIXED' ' +test_expect_failure PERL 'test branch B_MIXED' ' test_cmp_branch_tree B_MIXED ' -test_expect_success 'test branch B_SPLIT' ' +test_expect_success PERL 'test branch B_SPLIT' ' test_cmp_branch_tree B_SPLIT ' -test_expect_failure 'test tag vendortag' ' +test_expect_failure PERL 'test tag vendortag' ' test_cmp_branch_tree vendortag ' -test_expect_success 'test tag T_ALL_INITIAL_FILES' ' +test_expect_success PERL 'test tag T_ALL_INITIAL_FILES' ' test_cmp_branch_tree T_ALL_INITIAL_FILES ' -test_expect_failure 'test tag T_ALL_INITIAL_FILES_BUT_ONE' ' +test_expect_failure PERL 'test tag T_ALL_INITIAL_FILES_BUT_ONE' ' test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE ' -test_expect_failure 'test tag T_MIXED' ' +test_expect_failure PERL 'test tag T_MIXED' ' test_cmp_branch_tree T_MIXED -- cgit v1.2.1 From 9b777a165e050f9a881a74a5902a8ddd2de30da5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 Aug 2010 09:25:01 -0700 Subject: cvs tests: do not touch test CVS repositories shipped with source Some tests in t96xx series (cvsimport) want to write into the control area (CVSROOT) of their test CVS repositories, but this does not work well when the source area is made read-only (test trash directories are moved via --root=else/where option). Copy the supplied test CVS repository to a scratch place at the beginning of these tests. Signed-off-by: Junio C Hamano --- t/t9602-cvsimport-branches-tags.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 't/t9602-cvsimport-branches-tags.sh') diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh index 89da4aead..e1db323f5 100755 --- a/t/t9602-cvsimport-branches-tags.sh +++ b/t/t9602-cvsimport-branches-tags.sh @@ -6,10 +6,7 @@ test_description='git cvsimport handling of branches and tags' . ./lib-cvs.sh -test_expect_success PERL 'setup CVSROOT' ' - CVSROOT="$TEST_DIRECTORY"/t9602/cvsroot && - export CVSROOT -' +setup_cvs_test_repository t9602 test_expect_success PERL 'import module' ' -- cgit v1.2.1