development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

t/t9600-cvsimport.sh: change from skip_all=* to prereq skip

Browse source 
Change this test to skip test with test prerequisites, and to do setup
work in tests. This improves the skipped statistics on platforms where
the test isn't run.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2010-08-13 20:40:07 +00:00 committed by Junio C Hamano
parent f2f7b6a550
commit 900eab4427
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
t/t9600-cvsimport.sh
View file

@ -3,17 +3,14 @@
test_description='git cvsimport basic tests'
. ./lib-cvs.sh
if ! test_have_prereq PERL; then
skip_all='skipping git cvsimport tests, perl not available'
test_done
fi
test_expect_success PERL 'setup cvsroot environment' '
CVSROOT=$(pwd)/cvsroot &&
export CVSROOT
'
CVSROOT=$(pwd)/cvsroot
export CVSROOT
test_expect_success PERL 'setup cvsroot' '$CVS init'
test_expect_success 'setup cvsroot' '$CVS init'
test_expect_success 'setup a cvs module' '
test_expect_success PERL 'setup a cvs module' '
mkdir "$CVSROOT/module" &&
$CVS co -d module-cvs module &&
@ -45,23 +42,23 @@ EOF
cd ..
'
test_expect_success 'import a trivial module' '
test_expect_success PERL 'import a trivial module' '
git cvsimport -a -R -z 0 -C module-git module &&
test_cmp module-cvs/o_fortuna module-git/o_fortuna
'
test_expect_success 'pack refs' 'cd module-git && git gc && cd ..'
test_expect_success PERL 'pack refs' 'cd module-git && git gc && cd ..'
test_expect_success 'initial import has correct .git/cvs-revisions' '
test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
(cd module-git &&
git log --format="o_fortuna 1.1 %H" -1) > expected &&
test_cmp expected module-git/.git/cvs-revisions
'
test_expect_success 'update cvs module' '
test_expect_success PERL 'update cvs module' '
cd module-cvs &&
cat <<EOF >o_fortuna &&
@ -90,7 +87,7 @@ EOF
cd ..
'
test_expect_success 'update git module' '
test_expect_success PERL 'update git module' '
cd module-git &&
git cvsimport -a -R -z 0 module &&
@ -100,7 +97,7 @@ test_expect_success 'update git module' '
'
test_expect_success 'update has correct .git/cvs-revisions' '
test_expect_success PERL 'update has correct .git/cvs-revisions' '
(cd module-git &&
git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
@ -108,7 +105,7 @@ test_expect_success 'update has correct .git/cvs-revisions' '
test_cmp expected module-git/.git/cvs-revisions
'
test_expect_success 'update cvs module' '
test_expect_success PERL 'update cvs module' '
cd module-cvs &&
echo 1 >tick &&
@ -118,7 +115,7 @@ test_expect_success 'update cvs module' '
'
test_expect_success 'cvsimport.module config works' '
test_expect_success PERL 'cvsimport.module config works' '
cd module-git &&
git config cvsimport.module module &&
@ -129,7 +126,7 @@ test_expect_success 'cvsimport.module config works' '
'
test_expect_success 'second update has correct .git/cvs-revisions' '
test_expect_success PERL 'second update has correct .git/cvs-revisions' '
(cd module-git &&
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
@ -138,7 +135,7 @@ test_expect_success 'second update has correct .git/cvs-revisions' '
test_cmp expected module-git/.git/cvs-revisions
'
test_expect_success 'import from a CVS working tree' '
test_expect_success PERL 'import from a CVS working tree' '
$CVS co -d import-from-wt module &&
cd import-from-wt &&
@ -150,12 +147,12 @@ test_expect_success 'import from a CVS working tree' '
'
test_expect_success 'no .git/cvs-revisions created by default' '
test_expect_success PERL 'no .git/cvs-revisions created by default' '
! test -e import-from-wt/.git/cvs-revisions
'
test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
test_done