diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-04 08:15:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-04 08:15:36 -0700 |
| commit | a2c6726417db22bea7a878aeb88e18bcc95e5c0c (patch) | |
| tree | c79a6a559dfd0445a86dcc87df024136ddf02b44 /t/lib-cvs.sh | |
| parent | b480d38dab815e780234d0887f4185afc3db1b64 (diff) | |
| parent | e4c62e640db3f704b4c27435c6b8efdb170988dc (diff) | |
| download | git-a2c6726417db22bea7a878aeb88e18bcc95e5c0c.tar.gz | |
Merge branch 'ab/test-2'
* ab/test-2: (51 commits)
tests: factor HOME=$(pwd) in test-lib.sh
test-lib: use subshell instead of cd $new && .. && cd $old
tests: simplify "missing PREREQ" message
t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
test-lib: Allow overriding of TEST_DIRECTORY
test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
test: Introduce $GIT_BUILD_DIR
cvs tests: do not touch test CVS repositories shipped with source
t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
t/t7105-reset-patch.sh: Add a PERL prerequisite
t/t9001-send-email.sh: convert setup code to tests
t/t9001-send-email.sh: change from skip_all=* to prereq skip
t/t9001-send-email.sh: Remove needless PROG=* assignment
t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
lib-patch-mode tests: change from skip_all=* to prereq skip
t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
t/Makefile: Create test-results dir for smoke target
...
Conflicts:
t/t6035-merge-dir-to-symlink.sh
Diffstat (limited to 't/lib-cvs.sh')
| -rw-r--r-- | t/lib-cvs.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh index 648d1619c8..44263ade25 100644 --- a/t/lib-cvs.sh +++ b/t/lib-cvs.sh @@ -3,9 +3,6 @@ . ./test-lib.sh unset CVS_SERVER -# for clean cvsps cache -HOME=$(pwd) -export HOME if ! type cvs >/dev/null 2>&1 then @@ -30,6 +27,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" |