Skip to content

Commit

Permalink
Start a library for cvsimport-related tests
Browse files Browse the repository at this point in the history
For now the library just includes code (moved from t/t9600-cvsimport.sh)
that checks whether the prerequisites for "git cvsimport" are installed.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Feb 24, 2009
1 parent 8c5b85c commit 535bb89
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 28 deletions.
31 changes: 31 additions & 0 deletions t/lib-cvs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/sh

. ./test-lib.sh

unset CVS_SERVER
# for clean cvsps cache
HOME=$(pwd)
export HOME

if ! type cvs >/dev/null 2>&1
then
say 'skipping cvsimport tests, cvs not found'
test_done
exit
fi

cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
case "$cvsps_version" in
2.1 | 2.2*)
;;
'')
say 'skipping cvsimport tests, cvsps not found'
test_done
exit
;;
*)
say 'skipping cvsimport tests, unsupported cvsps version'
test_done
exit
;;
esac
29 changes: 1 addition & 28 deletions t/t9600-cvsimport.sh
Original file line number Diff line number Diff line change
@@ -1,37 +1,10 @@
#!/bin/sh

test_description='git cvsimport basic tests'
. ./test-lib.sh
. ./lib-cvs.sh

CVSROOT=$(pwd)/cvsroot
export CVSROOT
unset CVS_SERVER
# for clean cvsps cache
HOME=$(pwd)
export HOME

if ! type cvs >/dev/null 2>&1
then
say 'skipping cvsimport tests, cvs not found'
test_done
exit
fi

cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
case "$cvsps_version" in
2.1 | 2.2*)
;;
'')
say 'skipping cvsimport tests, cvsps not found'
test_done
exit
;;
*)
say 'skipping cvsimport tests, unsupported cvsps version'
test_done
exit
;;
esac

test_expect_success 'setup cvsroot' 'cvs init'

Expand Down

0 comments on commit 535bb89

Please sign in to comment.