branch master updated: * Pod-Simple-Texinfo/Makefile.am (AM_TESTS_ENVIRONMENT): set for out of source builds.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 73fa674763 * Pod-Simple-Texinfo/Makefile.am (AM_TESTS_ENVIRONMENT): 
set for out of source builds.
73fa674763 is described below

commit 73fa67476331f99bc83eaba88daf69cac4298897
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 6 16:55:29 2024 +0100

    * Pod-Simple-Texinfo/Makefile.am (AM_TESTS_ENVIRONMENT): set for out
    of source builds.
    
    * Pod-Simple-Texinfo/pod2texi.pl (BEGIN): Pod-Simple-Texinfo is
    not in builddir, but in srcdir.
    
    * Pod-Simple-Texinfo/prove.sh,
    Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t (BEGIN): use a similar setup
    as for other scripts to find the perl modules.
---
 ChangeLog                                 | 12 ++++++++++++
 Pod-Simple-Texinfo/Makefile.am            |  2 ++
 Pod-Simple-Texinfo/pod2texi.pl            |  4 ++--
 Pod-Simple-Texinfo/prove.sh               | 11 +----------
 Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t | 26 +++++++++++++++++++++++++-
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c41e470a4e..9b97eb0402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-01-06  Patrice Dumas  <pertusus@free.fr>
+
+       * Pod-Simple-Texinfo/Makefile.am (AM_TESTS_ENVIRONMENT): set for out
+       of source builds.
+
+       * Pod-Simple-Texinfo/pod2texi.pl (BEGIN): Pod-Simple-Texinfo is
+       not in builddir, but in srcdir.
+
+       * Pod-Simple-Texinfo/prove.sh,
+       Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t (BEGIN): use a similar setup
+       as for other scripts to find the perl modules.
+
 2024-01-06  Patrice Dumas  <pertusus@free.fr>
 
        Fix memory leaks found with valgrind
diff --git a/Pod-Simple-Texinfo/Makefile.am b/Pod-Simple-Texinfo/Makefile.am
index f7847cb5e9..32a3c98923 100644
--- a/Pod-Simple-Texinfo/Makefile.am
+++ b/Pod-Simple-Texinfo/Makefile.am
@@ -9,6 +9,8 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+AM_TESTS_ENVIRONMENT = srcdir="$(srcdir)"; export srcdir; 
top_srcdir="$(top_srcdir)"; export top_srcdir; builddir="$(builddir)"; export 
buildir; top_builddir="$(top_builddir)"; export top_builddir;
+
 nodist_bin_SCRIPTS = pod2texi
 
 test_files = prove.sh
diff --git a/Pod-Simple-Texinfo/pod2texi.pl b/Pod-Simple-Texinfo/pod2texi.pl
index 5b3f8c5ef6..d2f9893091 100755
--- a/Pod-Simple-Texinfo/pod2texi.pl
+++ b/Pod-Simple-Texinfo/pod2texi.pl
@@ -59,8 +59,8 @@ BEGIN
     Texinfo::ModulePath::init(undef, undef, undef, 'updirs' => 1);
 
     # To find Pod::Simple::Texinfo
-    if (defined($ENV{'top_builddir'})) {
-      unshift @INC, File::Spec->catdir($ENV{'top_builddir'},
+    if (defined($ENV{'top_srcdir'})) {
+      unshift @INC, File::Spec->catdir($ENV{'top_srcdir'},
                                        'Pod-Simple-Texinfo', 'lib');
     } else {
       unshift @INC, File::Spec->catdir($command_directory, 'lib');
diff --git a/Pod-Simple-Texinfo/prove.sh b/Pod-Simple-Texinfo/prove.sh
index da652445a5..b33aad6382 100755
--- a/Pod-Simple-Texinfo/prove.sh
+++ b/Pod-Simple-Texinfo/prove.sh
@@ -11,13 +11,4 @@ if test z"$srcdir" = 'z'; then
   srcdir='.'
 fi
 
-#prove -I "$tpdir" -I "$srcdir"/lib "$srcdir"/t/*.t
-
-tpdir=$srcdir/../tp
-# the last -I ../tp is here to find modules in the build directory, which 
should
-# be the case for Texinfo::ModulePath
-prove -I "$tpdir" -I "$tpdir"/maintain/lib/Unicode-EastAsianWidth/lib/ \
-      -I "$tpdir"/maintain/lib/libintl-perl/lib \
-      -I "$tpdir"/maintain/lib/Text-Unidecode/lib/ \
-      -I "$srcdir"/lib -I ../tp \
-      "$srcdir"/t/*.t
+prove      "$srcdir"/t/*.t
diff --git a/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t 
b/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t
index 790a8dc3b0..2b46f1c103 100644
--- a/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t
+++ b/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t
@@ -6,7 +6,31 @@
 # change 'tests => 1' to 'tests => last_test_to_print';
 
 use Test::More;
-BEGIN { plan tests => 21 };
+use File::Spec;
+
+BEGIN {
+  plan tests => 21;
+
+  my $updir = File::Spec->updir();
+  # To find Texinfo::ModulePath
+  if (defined($ENV{'top_builddir'})) {
+    unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp');
+  } else {
+    unshift @INC, File::Spec->catdir($updir, 'tp');
+  }
+
+  require Texinfo::ModulePath;
+  # NOTE updirs argument is correct but not used, as top_srcdir is set
+  Texinfo::ModulePath::init(undef, undef, undef, 'updirs' => 2);
+
+  # To find Pod::Simple::Texinfo
+  if (defined($ENV{'top_srcdir'})) {
+    unshift @INC, File::Spec->catdir($ENV{'top_srcdir'},
+                                     'Pod-Simple-Texinfo', 'lib');
+  } else {
+    unshift @INC, File::Spec->catdir('lib');
+  }
+};
 use Pod::Simple::Texinfo;
 ok(1); # If we made it this far, we're ok.