Merge branch 'nd/no-more-fnmatch'

diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index 648d1619c86bb676faadf62bd831683cb46d6be2..5076718916388d6abf483220cd35f9f61394abc4 100644 (file)
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -1,11 +1,8 @@
-#!/bin/sh
+# Shell library sourced instead of ./test-lib.sh by cvsimport tests.
 
 . ./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"