summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2008-01-26 09:54:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-27 01:44:05 (GMT)
commit7549376587ba5ffea973663f72804072d8f1d5dd (patch)
tree4fcd17375da2071a878f4bedddb5537720bd3b68
parentab8daa183638cea6238ec5949c99fefdcc29bd8c (diff)
downloadgit-7549376587ba5ffea973663f72804072d8f1d5dd.zip
git-7549376587ba5ffea973663f72804072d8f1d5dd.tar.gz
git-7549376587ba5ffea973663f72804072d8f1d5dd.tar.bz2
t9400-git-cvsserver-server: Wrap setup into test case
It is preferable to have the test setup in a test case. The setup itself may fail and having it as a test case handles this situation more gracefully. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9400-git-cvsserver-server.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 641303e..1f2749e 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -33,13 +33,14 @@ CVS_SERVER=git-cvsserver
export CVSROOT CVS_SERVER
rm -rf "$CVSWORK" "$SERVERDIR"
-echo >empty &&
+test_expect_success 'setup' '
+ echo >empty &&
git add empty &&
git commit -q -m "First Commit" &&
git clone -q --local --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
- GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" ||
- exit 1
+ GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
+'
# note that cvs doesn't accept absolute pathnames
# as argument to co -d