Skip to content

Commit 40ae887

Browse files
flichtenheldgitster
authored andcommitted
t9600-cvsimport.sh: set HOME before checking for cvsps availability
This actually sounds like a bug in cvsps, which requires an existing home directory when asked for the usage through -h $ HOME=/nonexistent cvsps -h Cannot create the cvsps directory '.cvsps': No such file or directory This made t9600 think that cvsps is not available if HOME did not exist, causing the tests to be skipped $ HOME=/nonexistent sh t9600-cvsimport.sh * skipping cvsimport tests, cvsps not found * passed all 0 test(s) Now t9600 sets HOME to the current working directory before checking for the availability of the cvsps program. This issue has been discovered by Marco Rodrigues, and fixed by Frank Lichtenheld through http://bugs.debian.org/471969 Signed-off-by: Gerrit Pape <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent af05d67 commit 40ae887

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t9600-cvsimport.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
test_description='git-cvsimport basic tests'
44
. ./test-lib.sh
55

6+
CVSROOT=$(pwd)/cvsroot
7+
export CVSROOT
8+
# for clean cvsps cache
9+
HOME=$(pwd)
10+
export HOME
11+
612
if ! type cvs >/dev/null 2>&1
713
then
814
say 'skipping cvsimport tests, cvs not found'
@@ -26,12 +32,6 @@ case "$cvsps_version" in
2632
;;
2733
esac
2834

29-
CVSROOT=$(pwd)/cvsroot
30-
export CVSROOT
31-
# for clean cvsps cache
32-
HOME=$(pwd)
33-
export HOME
34-
3535
test_expect_success 'setup cvsroot' 'cvs init'
3636

3737
test_expect_success 'setup a cvs module' '

0 commit comments

Comments
 (0)