mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pb/maint-use-custom-perl' into maint

Browse Source 
* pb/maint-use-custom-perl:
  Make sure $PERL_PATH is defined when the test suite is run.
This commit is contained in:
Junio C Hamano
2009-12-03 13:51:41 -08:00
parent d1dfc016d8 be38ca3d19
commit 9c1506af6a
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1629,6 +1629,7 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
# and the first level quoting from the shell that runs "echo". # and the first level quoting from the shell that runs "echo".
GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@ @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@

2
t/t9400-git-cvsserver-server.sh
View File

@ -20,7 +20,7 @@ then
say 'skipping git-cvsserver tests, cvs not found' say 'skipping git-cvsserver tests, cvs not found'
test_done test_done
fi fi
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable' say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
test_done test_done
} }

2
t/t9401-git-cvsserver-crlf.sh
View File

@ -57,7 +57,7 @@ then
say 'skipping git-cvsserver tests, perl not available' say 'skipping git-cvsserver tests, perl not available'
test_done test_done
fi fi
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable' say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
test_done test_done
} }

4
t/t9700-perl-git.sh
View File

@ -11,7 +11,7 @@ if ! test_have_prereq PERL; then
test_done test_done
fi fi
perl -MTest::More -e 0 2>/dev/null || { "$PERL_PATH" -MTest::More -e 0 2>/dev/null || {
say "Perl Test::More unavailable, skipping test" say "Perl Test::More unavailable, skipping test"
test_done test_done
} }
@ -48,6 +48,6 @@ test_expect_success \
test_external_without_stderr \ test_external_without_stderr \
'Perl API' \ 'Perl API' \
perl "$TEST_DIRECTORY"/t9700/test.pl "$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl
test_done test_done