Skip to content

Commit

Permalink
tests: skip perl tests if NO_PERL is defined
Browse files Browse the repository at this point in the history
These scripts all test git programs that are written in
perl, and thus obviously won't work if NO_PERL is defined.
We pass NO_PERL to the scripts from the building Makefile
via the GIT-BUILD-OPTIONS file.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Apr 9, 2009
1 parent 499c293 commit 1b19ccd
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,7 @@ GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@

### Detect Tck/Tk interpreter path changes
ifndef NO_TCLTK
Expand Down
4 changes: 4 additions & 0 deletions t/lib-git-svn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ then
say 'skipping git svn tests, NO_SVN_TESTS defined'
test_done
fi
if ! test_have_prereq PERL; then
say 'skipping git svn tests, perl not available'
test_done
fi

GIT_DIR=$PWD/.git
GIT_SVN_DIR=$GIT_DIR/svn/git-svn
Expand Down
5 changes: 5 additions & 0 deletions t/t3701-add-interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
test_description='add -i basic tests'
. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping git add -i tests, perl not available'
test_done
fi

test_expect_success 'setup (initial)' '
echo content >file &&
git add file &&
Expand Down
4 changes: 2 additions & 2 deletions t/t7501-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test_expect_success \
"echo King of the bongo >file &&
test_must_fail git commit -m foo -a file"

test_expect_success \
test_expect_success PERL \
"using paths with --interactive" \
"echo bong-o-bong >file &&
! (echo 7 | git commit -m foo --interactive file)"
Expand Down Expand Up @@ -119,7 +119,7 @@ test_expect_success \
"echo 'gak' >file && \
git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"

test_expect_success \
test_expect_success PERL \
"interactive add" \
"echo 7 | git commit --interactive | grep 'What now'"

Expand Down
5 changes: 5 additions & 0 deletions t/t9001-send-email.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
test_description='git send-email'
. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping git send-email tests, perl not available'
test_done
fi

PROG='git send-email'
test_expect_success \
'prepare reference tree' \
Expand Down
5 changes: 5 additions & 0 deletions t/t9200-git-cvsexportcommit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ test_description='Test export of commits to CVS'

. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping git cvsexportcommit tests, perl not available'
test_done
fi

cvs >/dev/null 2>&1
if test $? -ne 1
then
Expand Down
4 changes: 4 additions & 0 deletions t/t9400-git-cvsserver-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ cvs CLI client via git-cvsserver server'

. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping git cvsserver tests, perl not available'
test_done
fi
cvs >/dev/null 2>&1
if test $? -ne 1
then
Expand Down
5 changes: 5 additions & 0 deletions t/t9401-git-cvsserver-crlf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ then
say 'skipping git-cvsserver tests, cvs not found'
test_done
fi
if ! test_have_prereq PERL
then
say 'skipping git-cvsserver tests, perl not available'
test_done
fi
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
test_done
Expand Down
5 changes: 5 additions & 0 deletions t/t9500-gitweb-standalone-no-errors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ gitweb_run () {

. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping gitweb tests, perl not available'
test_done
fi

perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
say 'skipping gitweb tests, perl version is too old'
test_done
Expand Down
5 changes: 5 additions & 0 deletions t/t9600-cvsimport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
test_description='git cvsimport basic tests'
. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping git cvsimport tests, perl not available'
test_done
fi

CVSROOT=$(pwd)/cvsroot
export CVSROOT
unset CVS_SERVER
Expand Down
5 changes: 5 additions & 0 deletions t/t9700-perl-git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
test_description='perl interface (Git.pm)'
. ./test-lib.sh

if ! test_have_prereq PERL; then
say 'skipping perl interface tests, perl not available'
test_done
fi

perl -MTest::More -e 0 2>/dev/null || {
say "Perl Test::More unavailable, skipping test"
test_done
Expand Down
2 changes: 2 additions & 0 deletions t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,8 @@ case $(uname -s) in
;;
esac

test -z "$NO_PERL" && test_set_prereq PERL

# test whether the filesystem supports symbolic links
ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
rm -f y

0 comments on commit 1b19ccd

Please sign in to comment.