sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-30 00:04:49 -04:00
Code Issues Projects Releases Wiki Activity

Make configure check for a couple more Perl modules for --enable-tap-tests.

Browse Source 
Red Hat's notion of a basic Perl installation doesn't include Test::More
or Time::HiRes, and reportedly some Debian installs also omit Time::HiRes.
Check for those during configure to spare the user the pain of digging
through check-world output to find out what went wrong.  While we're at it,
we should also check the version of Test::More, since TestLib.pm requires
at least 0.87.

In principle this could be back-patched, but it's probably not necessary.

Discussion: https://postgr.es/m/516.1521475003@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2018-03-20 15:16:16 -04:00
parent 94150513ec
commit 264eb03aab
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -16517,6 +16517,12 @@ if test "$enable_tap_tests" = yes; then
# (prove might be part of a different Perl installation than perl, eg on # (prove might be part of a different Perl installation than perl, eg on
# MSys, so the result of AX_PROG_PERL_MODULES could be irrelevant anyway.) # MSys, so the result of AX_PROG_PERL_MODULES could be irrelevant anyway.)
if test -z "$PROVE"; then if test -z "$PROVE"; then
# Test::More and Time::HiRes are supposed to be part of core Perl,
# but some distros omit them in a minimal installation.
@ -16566,7 +16572,7 @@ fi
if test "x$PERL" != x; then if test "x$PERL" != x; then
ax_perl_modules_failed=0 ax_perl_modules_failed=0
for ax_perl_module in 'IPC::Run' ; do for ax_perl_module in 'IPC::Run' 'Test::More 0.87' 'Time::HiRes' ; do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl module $ax_perl_module" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl module $ax_perl_module" >&5
$as_echo_n "checking for perl module $ax_perl_module... " >&6; } $as_echo_n "checking for perl module $ax_perl_module... " >&6; }
@ -16588,7 +16594,7 @@ $as_echo "ok" >&6; };
else else
: :
as_fn_error $? "Perl module IPC::Run is required to run TAP tests" "$LINENO" 5 as_fn_error $? "Additional Perl modules are required to run TAP tests" "$LINENO" 5
fi fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5

6
configure.in
View File

@ -2114,8 +2114,10 @@ if test "$enable_tap_tests" = yes; then
# (prove might be part of a different Perl installation than perl, eg on # (prove might be part of a different Perl installation than perl, eg on
# MSys, so the result of AX_PROG_PERL_MODULES could be irrelevant anyway.) # MSys, so the result of AX_PROG_PERL_MODULES could be irrelevant anyway.)
if test -z "$PROVE"; then if test -z "$PROVE"; then
AX_PROG_PERL_MODULES(IPC::Run, , # Test::More and Time::HiRes are supposed to be part of core Perl,
AC_MSG_ERROR([Perl module IPC::Run is required to run TAP tests])) # but some distros omit them in a minimal installation.
AX_PROG_PERL_MODULES([IPC::Run Test::More=0.87 Time::HiRes], ,
[AC_MSG_ERROR([Additional Perl modules are required to run TAP tests])])
fi fi
# Now make sure we know where prove is # Now make sure we know where prove is
PGAC_PATH_PROGS(PROVE, prove) PGAC_PATH_PROGS(PROVE, prove)