diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:28:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:28:46 -0800 |
| commit | 37e3b6104e8b795f70186c6d9138262a0bf5688e (patch) | |
| tree | 7199f0c0848a58b6d813eb619f6c4b27e75291ba /t | |
| parent | eb2fc8f899a58eedc87e7e8ea0fdecdc2ba9f430 (diff) | |
| parent | be38ca3d19be50be447e1c5952f53fa70bf21a1c (diff) | |
| download | git-37e3b6104e8b795f70186c6d9138262a0bf5688e.tar.gz git-37e3b6104e8b795f70186c6d9138262a0bf5688e.tar.xz | |
Merge branch 'pb/maint-use-custom-perl'
* pb/maint-use-custom-perl:
Make sure $PERL_PATH is defined when the test suite is run.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9400-git-cvsserver-server.sh | 2 | ||||
| -rwxr-xr-x | t/t9401-git-cvsserver-crlf.sh | 2 | ||||
| -rwxr-xr-x | t/t9700-perl-git.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 64f947d75..c2ec3cb4b 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -20,7 +20,7 @@ then say 'skipping git-cvsserver tests, cvs not found' test_done 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' test_done } diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh index aca40c1b1..40637d678 100755 --- a/t/t9401-git-cvsserver-crlf.sh +++ b/t/t9401-git-cvsserver-crlf.sh @@ -57,7 +57,7 @@ then say 'skipping git-cvsserver tests, perl not available' test_done 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' test_done } diff --git a/t/t9700-perl-git.sh b/t/t9700-perl-git.sh index 4eb7d3f7f..8686086dd 100755 --- a/t/t9700-perl-git.sh +++ b/t/t9700-perl-git.sh @@ -11,7 +11,7 @@ if ! test_have_prereq PERL; then test_done 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" test_done } @@ -48,6 +48,6 @@ test_expect_success \ test_external_without_stderr \ 'Perl API' \ - perl "$TEST_DIRECTORY"/t9700/test.pl + "$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl test_done |