From: Eugene Kazakov <e.kazakov@postgrespro.ru>
To: Michael Paquier <michael.paquier@gmail.com>
To: Robert Haas <robertmhaas@gmail.com>
Cc: pgsql-hackers@postgresql.org <pgsql-hackers@postgresql.org>
Subject: Re: Small PATCH: check of 2 Perl modules
Date: Mon, 15 Feb 2016 15:50:48 +0300
Message-ID: <56C1C9A8.5070604@postgrespro.ru> (raw)
In-Reply-To: <CAB7nPqRXf2otzvrTgJPgqBg_Zuo4+aOnPAtwLLeo0KAJxPL5hw@mail.gmail.com>
References: <56BDDC20.9020506@postgrespro.ru>
<CA+Tgmobysnubke6W_k0_RfNK8TX0nDgWrNdprjTh3s5wJU9vpQ@mail.gmail.com>
<CAB7nPqRXf2otzvrTgJPgqBg_Zuo4+aOnPAtwLLeo0KAJxPL5hw@mail.gmail.com>
List-Unsubscribe: <mailto:majordomo@postgresql.org?body=unsub%20pgsql-hackers>
13.02.2016 16:04, Michael Paquier :
> On Sat, Feb 13, 2016 at 1:47 PM, Robert Haas <robertmhaas@gmail.com> wrote:
>> On Fri, Feb 12, 2016 at 8:20 AM, Eugene Kazakov
>> <e.kazakov@postgrespro.ru> wrote:
>>> TAP-tests need two Perl modules: Test::More and IPC::Run.
>>>
>>> The patch adds checking of modules in configure.in and configure.
>> Why would we want that?
> I was doubtful at the beginning, but it doesn't hurt to have those
> sanity checks in configure actually. The idea is that when
> --enable-tap-tests is used now we simply error with "Can't locate
> IPC/Run.pm in @INC" when kicking the tests, this check would allow one
> to know if his environment is adapted to run the tests or not before
> compiling anything.
>
> And with this patch, we would fail now with that:
> configure: error: Need Perl IPC::Run module
>
> By the way, the patch given upthread by Eugene is incorrect. To begin
> with, AX_PROG_PERL_MODULES has not been compiled by autoconf and I
> can't believe that it is available on all platforms, for example on
> OSX 10.8 I could not see it. And it is actually here:
> https://www.gnu.org/software/autoconf-archive/ax_prog_perl_modules.html
>
> I would recommend grabbing a copy of this file, and change the error
> message as follows:
> Perl module IPC::Run is required to run TAP tests
>
> See the patch attached as reference, we could simplify the macro of
> this m4 file and remove the check for perl, which is here:
> +# Make sure we have perl
> +if test -z "$PERL"; then
> +AC_CHECK_PROG(PERL,perl,perl)
> +fi
> Though I kept the original script as-is in the patch attached.
> Regards,
Michael,
Thank you. You are right, of course. I missed the
m4_ax_prog_perl_modules. Please, see the fixed version of patch in the
attach. I added m4_ax_prog_perl_modules and change the error messages.
The best regards,
Eugene Kazakov,
Postgres Professional
diff --git a/aclocal.m4 b/aclocal.m4index 6f930b6..e6b2aaf 100644--- a/aclocal.m4+++ b/aclocal.m4@@ -10,3 +10,4 @@ m4_include([config/perl.m4])
m4_include([config/programs.m4])
m4_include([config/python.m4])
m4_include([config/tcl.m4])
+m4_include([config/m4_ax_prog_perl_modules.m4])diff --git a/config/m4_ax_prog_perl_modules.m4 b/config/m4_ax_prog_perl_modules.m4new file mode 100644index 0000000..ed5dd30--- /dev/null+++ b/config/m4_ax_prog_perl_modules.m4@@ -0,0 +1,72 @@+# ===========================================================================+# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_modules.html+# ===========================================================================+#+# SYNOPSIS+#+# AX_PROG_PERL_MODULES([MODULES], [ACTION-IF-TRUE], [ACTION-IF-FALSE])+#+# DESCRIPTION+#+# Checks to see if the given perl modules are available. If true the shell+# commands in ACTION-IF-TRUE are executed. If not the shell commands in+# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by+# calling AC_CHECK_PROG, or AC_PATH_PROG), AC_CHECK_PROG(PERL, perl, perl)+# will be run.+#+# MODULES is a space separated list of module names. To check for a+# minimum version of a module, append the version number to the module+# name, separated by an equals sign.+#+# Example:+#+# AX_PROG_PERL_MODULES( Text::Wrap Net::LDAP=1.0.3, ,+# AC_MSG_WARN(Need some Perl modules)+#+# LICENSE+#+# Copyright (c) 2009 Dean Povey <povey@wedgetail.com>+#+# Copying and distribution of this file, with or without modification, are+# permitted in any medium without royalty provided the copyright notice+# and this notice are preserved. This file is offered as-is, without any+# warranty.++#serial 7++AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES])+AC_DEFUN([AX_PROG_PERL_MODULES],[dnl++m4_define([ax_perl_modules])+m4_foreach([ax_perl_module], m4_split(m4_normalize([$1])),+ [+ m4_append([ax_perl_modules],+ [']m4_bpatsubst(ax_perl_module,=,[ ])[' ])+ ])++if test "x$PERL" != x; then+ ax_perl_modules_failed=0+ for ax_perl_module in ax_perl_modules; do+ AC_MSG_CHECKING(for perl module $ax_perl_module)++ # Would be nice to log result here, but can't rely on autoconf internals+ $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1+ if test $? -ne 0; then+ AC_MSG_RESULT(no);+ ax_perl_modules_failed=1+ else+ AC_MSG_RESULT(ok);+ fi+ done++ # Run optional shell commands+ if test "$ax_perl_modules_failed" = 0; then+ :+ $2+ else+ :+ $3+ fi+else+ AC_MSG_WARN(could not find perl)+fi])dnldiff --git a/configure b/configureindex 1903815..2d80202 100755--- a/configure+++ b/configure@@ -15554,6 +15554,79 @@ done
if test -z "$PERL"; then
as_fn_error $? "Perl not found" "$LINENO" 5
fi
++++++++if test "x$PERL" != x; then+ ax_perl_modules_failed=0+ for ax_perl_module in 'Test::More' ; do+ { $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; }++ # Would be nice to log result here, but can't rely on autoconf internals+ $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1+ if test $? -ne 0; then+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5+$as_echo "no" >&6; };+ ax_perl_modules_failed=1+ else+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5+$as_echo "ok" >&6; };+ fi+ done++ # Run optional shell commands+ if test "$ax_perl_modules_failed" = 0; then+ :++ else+ :+ as_fn_error $? "Perl module IPC::Test is required to run TAP tests " "$LINENO" 5+ fi+else+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5+$as_echo "$as_me: WARNING: could not find perl" >&2;}+fi+++++++if test "x$PERL" != x; then+ ax_perl_modules_failed=0+ for ax_perl_module in 'IPC::Run' ; do+ { $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; }++ # Would be nice to log result here, but can't rely on autoconf internals+ $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1+ if test $? -ne 0; then+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5+$as_echo "no" >&6; };+ ax_perl_modules_failed=1+ else+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5+$as_echo "ok" >&6; };+ fi+ done++ # Run optional shell commands+ if test "$ax_perl_modules_failed" = 0; then+ :++ else+ :+ as_fn_error $? "Perl module IPC::Run is required to run TAP tests " "$LINENO" 5+ fi+else+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5+$as_echo "$as_me: WARNING: could not find perl" >&2;}+fi
fi
# Thread testing
diff --git a/configure.in b/configure.inindex 0bd90d7..c265471 100644--- a/configure.in+++ b/configure.in@@ -2055,6 +2055,9 @@ if test "$enable_tap_tests" = yes; then
if test -z "$PERL"; then
AC_MSG_ERROR([Perl not found])
fi
++ AX_PROG_PERL_MODULES( Test::More, , AC_MSG_ERROR( [Perl module IPC::Test is required to run TAP tests] ))+ AX_PROG_PERL_MODULES( IPC::Run, , AC_MSG_ERROR( [Perl module IPC::Run is required to run TAP tests] ))
fi
# Thread testing
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackersAttachments:
[text/plain] configure-tap-modules-v3 (5.3K, ../56C1C9A8.5070604@postgrespro.ru/2-configure-tap-modules-v3)
download | inline diff:diff --git a/aclocal.m4 b/aclocal.m4index 6f930b6..e6b2aaf 100644--- a/aclocal.m4+++ b/aclocal.m4@@ -10,3 +10,4 @@ m4_include([config/perl.m4])
m4_include([config/programs.m4])
m4_include([config/python.m4])
m4_include([config/tcl.m4])
+m4_include([config/m4_ax_prog_perl_modules.m4])diff --git a/config/m4_ax_prog_perl_modules.m4 b/config/m4_ax_prog_perl_modules.m4new file mode 100644index 0000000..ed5dd30--- /dev/null+++ b/config/m4_ax_prog_perl_modules.m4@@ -0,0 +1,72 @@+# ===========================================================================+# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_modules.html+# ===========================================================================+#+# SYNOPSIS+#+# AX_PROG_PERL_MODULES([MODULES], [ACTION-IF-TRUE], [ACTION-IF-FALSE])+#+# DESCRIPTION+#+# Checks to see if the given perl modules are available. If true the shell+# commands in ACTION-IF-TRUE are executed. If not the shell commands in+# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by+# calling AC_CHECK_PROG, or AC_PATH_PROG), AC_CHECK_PROG(PERL, perl, perl)+# will be run.+#+# MODULES is a space separated list of module names. To check for a+# minimum version of a module, append the version number to the module+# name, separated by an equals sign.+#+# Example:+#+# AX_PROG_PERL_MODULES( Text::Wrap Net::LDAP=1.0.3, ,+# AC_MSG_WARN(Need some Perl modules)+#+# LICENSE+#+# Copyright (c) 2009 Dean Povey <povey@wedgetail.com>+#+# Copying and distribution of this file, with or without modification, are+# permitted in any medium without royalty provided the copyright notice+# and this notice are preserved. This file is offered as-is, without any+# warranty.++#serial 7++AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES])+AC_DEFUN([AX_PROG_PERL_MODULES],[dnl++m4_define([ax_perl_modules])+m4_foreach([ax_perl_module], m4_split(m4_normalize([$1])),+ [+ m4_append([ax_perl_modules],+ [']m4_bpatsubst(ax_perl_module,=,[ ])[' ])+ ])++if test "x$PERL" != x; then+ ax_perl_modules_failed=0+ for ax_perl_module in ax_perl_modules; do+ AC_MSG_CHECKING(for perl module $ax_perl_module)++ # Would be nice to log result here, but can't rely on autoconf internals+ $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1+ if test $? -ne 0; then+ AC_MSG_RESULT(no);+ ax_perl_modules_failed=1+ else+ AC_MSG_RESULT(ok);+ fi+ done++ # Run optional shell commands+ if test "$ax_perl_modules_failed" = 0; then+ :+ $2+ else+ :+ $3+ fi+else+ AC_MSG_WARN(could not find perl)+fi])dnldiff --git a/configure b/configureindex 1903815..2d80202 100755--- a/configure+++ b/configure@@ -15554,6 +15554,79 @@ done
if test -z "$PERL"; then
as_fn_error $? "Perl not found" "$LINENO" 5
fi
++++++++if test "x$PERL" != x; then+ ax_perl_modules_failed=0+ for ax_perl_module in 'Test::More' ; do+ { $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; }++ # Would be nice to log result here, but can't rely on autoconf internals+ $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1+ if test $? -ne 0; then+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5+$as_echo "no" >&6; };+ ax_perl_modules_failed=1+ else+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5+$as_echo "ok" >&6; };+ fi+ done++ # Run optional shell commands+ if test "$ax_perl_modules_failed" = 0; then+ :++ else+ :+ as_fn_error $? "Perl module IPC::Test is required to run TAP tests " "$LINENO" 5+ fi+else+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5+$as_echo "$as_me: WARNING: could not find perl" >&2;}+fi+++++++if test "x$PERL" != x; then+ ax_perl_modules_failed=0+ for ax_perl_module in 'IPC::Run' ; do+ { $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; }++ # Would be nice to log result here, but can't rely on autoconf internals+ $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1+ if test $? -ne 0; then+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5+$as_echo "no" >&6; };+ ax_perl_modules_failed=1+ else+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5+$as_echo "ok" >&6; };+ fi+ done++ # Run optional shell commands+ if test "$ax_perl_modules_failed" = 0; then+ :++ else+ :+ as_fn_error $? "Perl module IPC::Run is required to run TAP tests " "$LINENO" 5+ fi+else+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5+$as_echo "$as_me: WARNING: could not find perl" >&2;}+fi
fi
# Thread testing
diff --git a/configure.in b/configure.inindex 0bd90d7..c265471 100644--- a/configure.in+++ b/configure.in@@ -2055,6 +2055,9 @@ if test "$enable_tap_tests" = yes; then
if test -z "$PERL"; then
AC_MSG_ERROR([Perl not found])
fi
++ AX_PROG_PERL_MODULES( Test::More, , AC_MSG_ERROR( [Perl module IPC::Test is required to run TAP tests] ))+ AX_PROG_PERL_MODULES( IPC::Run, , AC_MSG_ERROR( [Perl module IPC::Run is required to run TAP tests] ))
fi
# Thread testing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: e.kazakov@postgrespro.ru, michael.paquier@gmail.com, robertmhaas@gmail.com
Subject: Re: Small PATCH: check of 2 Perl modules
In-Reply-To: <56C1C9A8.5070604@postgrespro.ru>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox