Permalink
Browse files

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 <gitster@pobox.com>
  • Loading branch information...
1 parent 06eaaa7 commit 9b777a165e050f9a881a74a5902a8ddd2de30da5 @gitster gitster committed Aug 16, 2010
Showing with 9 additions and 11 deletions.
  1. +0 −1 t/Makefile
  2. +6 −0 t/lib-cvs.sh
  3. +1 −4 t/t9601-cvsimport-vendor-branch.sh
  4. +1 −4 t/t9602-cvsimport-branches-tags.sh
  5. +1 −2 t/t9603-cvsimport-patchsets.sh
View
@@ -29,7 +29,6 @@ pre-clean:
clean:
$(RM) -r 'trash directory'.* test-results
- $(RM) t????/cvsroot/CVSROOT/?*
$(RM) -r valgrind/bin
$(RM) .prove
View
@@ -30,6 +30,12 @@ case "$cvsps_version" in
;;
esac
+setup_cvs_test_repository () {
+ CVSROOT="$(pwd)/.cvsroot" &&
+ cp -r "$TEST_DIRECTORY/$1/cvsroot" "$CVSROOT" &&
+ export CVSROOT
+}
+
test_cvs_co () {
# Usage: test_cvs_co BRANCH_NAME
rm -rf module-cvs-"$1"
@@ -34,10 +34,7 @@
test_description='git cvsimport handling of vendor branches'
. ./lib-cvs.sh
-test_expect_success PERL 'setup CVSROOT' '
- CVSROOT="$TEST_DIRECTORY"/t9601/cvsroot &&
- export CVSROOT
-'
+setup_cvs_test_repository t9601
test_expect_success PERL 'import a module with a vendor branch' '
@@ -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' '
@@ -14,8 +14,7 @@
test_description='git cvsimport testing for correct patchset estimation'
. ./lib-cvs.sh
-CVSROOT="$TEST_DIRECTORY"/t9603/cvsroot
-export CVSROOT
+setup_cvs_test_repository t9603
test_expect_failure 'import with criss cross times on revisions' '

0 comments on commit 9b777a1

Please sign in to comment.