Skip to content

Commit a0e0ec9

Browse files
peffgitster
authored andcommitted
t: provide a perl() function which uses $PERL_PATH
Once upon a time, we assumed that calling a bare "perl" in the test scripts was OK, because we would find the perl from the user's PATH, and we were only asking that perl to do basic operations that work even on old versions of perl. Later, we found that some systems really prefer to use $PERL_PATH even for these basic cases, because the system perl misbehaves in some way (e.g., by handling line endings differently). We then switched "perl" invocations to "$PERL_PATH" to respect the user's choice. Having to use "$PERL_PATH" is ugly and cumbersome, though. Instead, let's provide a perl() shell function that tests can use, which will transparently do the right thing. Unfortunately, test writers still have to use $PERL_PATH in certain situations, so we still need to keep the advice in the README. Note that this may fix test failures in t5004, t5503, t6002, t6003, t6300, t8001, and t8002, depending on your system's perl setup. All of these can be detected by running: ln -s /bin/false bin-wrappers/perl make test which fails before this patch, and passes after. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0d6cf24 commit a0e0ec9

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

t/README

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,11 @@ Don't:
340340
- use perl without spelling it as "$PERL_PATH". This is to help our
341341
friends on Windows where the platform Perl often adds CR before
342342
the end of line, and they bundle Git with a version of Perl that
343-
does not do so, whose path is specified with $PERL_PATH.
343+
does not do so, whose path is specified with $PERL_PATH. Note that we
344+
provide a "perl" function which uses $PERL_PATH under the hood, so
345+
you do not need to worry when simply running perl in the test scripts
346+
(but you do, for example, on a shebang line or in a sub script
347+
created via "write_script").
344348

345349
- use sh without spelling it as "$SHELL_PATH", when the script can
346350
be misinterpreted by broken platform shell (e.g. Solaris).
@@ -387,7 +391,7 @@ of the test_* functions (see the "Test harness library" section
387391
below), e.g.:
388392

389393
test_expect_success PERL 'I need Perl' '
390-
"$PERL_PATH" -e "hlagh() if unf_unf()"
394+
perl -e "hlagh() if unf_unf()"
391395
'
392396

393397
The advantage of skipping tests like this is that platforms that don't
@@ -520,7 +524,7 @@ library for your script to use.
520524

521525
test_external \
522526
'GitwebCache::*FileCache*' \
523-
"$PERL_PATH" "$TEST_DIRECTORY"/t9503/test_cache_interface.pl
527+
perl "$TEST_DIRECTORY"/t9503/test_cache_interface.pl
524528

525529
If the test is outputting its own TAP you should set the
526530
test_external_has_tap variable somewhere before calling the first
@@ -536,7 +540,7 @@ library for your script to use.
536540

537541
test_external_without_stderr \
538542
'Perl API' \
539-
"$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl
543+
perl "$TEST_DIRECTORY"/t9700/test.pl
540544

541545
- test_expect_code <exit-code> <command>
542546

t/test-lib-functions.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,3 +710,7 @@ test_ln_s_add () {
710710
git update-index --add --cacheinfo 120000 $ln_s_obj "$2"
711711
fi
712712
}
713+
714+
perl () {
715+
command "$PERL_PATH" "$@"
716+
}

0 commit comments

Comments
 (0)