[8055] ModulePath.pm import function

[gavinsmith0123]

Revision: 8055
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8055
Author:   gavin
Date:     2018-08-13 07:41:21 -0400 (Mon, 13 Aug 2018)
Log Message:
-----------
ModulePath.pm import function

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/ModulePath.pm.in
    trunk/tp/t/01use.t
    trunk/tp/t/02coverage.t
    trunk/tp/t/03coverage_braces.t
    trunk/tp/t/04verb.t
    trunk/tp/t/05paragraph.t
    trunk/tp/t/06columnfractions.t
    trunk/tp/t/08misc_commands.t
    trunk/tp/t/09indices.t
    trunk/tp/t/10menu.t
    trunk/tp/t/16raw.t
    trunk/tp/t/181quotation.t
    trunk/tp/t/18itemize.t
    trunk/tp/t/19def.t
    trunk/tp/t/20preformatted.t
    trunk/tp/t/21multitable.t
    trunk/tp/t/22xtable.t
    trunk/tp/t/25regions.t
    trunk/tp/t/27float.t
    trunk/tp/t/28heading.t
    trunk/tp/t/30sectioning.t
    trunk/tp/t/50value.t
    trunk/tp/t/55conditionals.t
    trunk/tp/t/57invalid_nestings.t
    trunk/tp/t/58alias.t
    trunk/tp/t/60macro.t
    trunk/tp/t/70value_and_macro.t
    trunk/tp/t/80include.t
    trunk/tp/t/accents.t
    trunk/tp/t/automatic_menus.t
    trunk/tp/t/automatic_nodes.t
    trunk/tp/t/collect_spaces.t
    trunk/tp/t/converters_tests.t
    trunk/tp/t/do_master_menu.t
    trunk/tp/t/docbook_tests.t
    trunk/tp/t/fix_texinfo.t
    trunk/tp/t/html_tests.t
    trunk/tp/t/index_before_item.t
    trunk/tp/t/info_tests.t
    trunk/tp/t/languages.t
    trunk/tp/t/nodenormalization.t
    trunk/tp/t/paragraph.t
    trunk/tp/t/plaintext_tests.t
    trunk/tp/t/protect_character_in_texinfo.t
    trunk/tp/t/reference_to_text_in_tree.t
    trunk/tp/t/test_brace_count.t
    trunk/tp/t/test_fill_gaps_in_sectioning.t
    trunk/tp/t/test_is_content_empty.t
    trunk/tp/t/test_protect_hashchar_at_line_beginning.t
    trunk/tp/t/test_sort.t
    trunk/tp/t/test_tree_copy.t
    trunk/tp/t/xml_tests.t

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/ChangeLog     2018-08-13 11:41:21 UTC (rev 8055)
@@ -2,6 +2,8 @@
 
        * tp/Texinfo/ModulePath.pm.in (init): Remove subroutine 
        prototype.
+       * tp/Texinfo/ModulePath.pm.in (import): Wrap 'init' to allow 
+       using module with "use Texinfo::ModulePath".
 
 2018-08-13  Gavin Smith  <address@hidden>
 

Modified: trunk/tp/Texinfo/ModulePath.pm.in
===================================================================
--- trunk/tp/Texinfo/ModulePath.pm.in   2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/Texinfo/ModulePath.pm.in   2018-08-13 11:41:21 UTC (rev 8055)
@@ -92,4 +92,9 @@
   }
 }
 
+sub import { 
+  my $class = shift;
+  goto &init;
+}
+
 1;

Modified: trunk/tp/t/01use.t
===================================================================
--- trunk/tp/t/01use.t  2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/01use.t  2018-08-13 11:41:21 UTC (rev 8055)
@@ -8,10 +8,8 @@
 use Test::More;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
+
 use Texinfo::Convert::Texinfo;
 
 plan tests => 2;

Modified: trunk/tp/t/02coverage.t
===================================================================
--- trunk/tp/t/02coverage.t     2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/02coverage.t     2018-08-13 11:41:21 UTC (rev 8055)
@@ -2,10 +2,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/03coverage_braces.t
===================================================================
--- trunk/tp/t/03coverage_braces.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/03coverage_braces.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/04verb.t
===================================================================
--- trunk/tp/t/04verb.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/04verb.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/05paragraph.t
===================================================================
--- trunk/tp/t/05paragraph.t    2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/05paragraph.t    2018-08-13 11:41:21 UTC (rev 8055)
@@ -2,10 +2,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/06columnfractions.t
===================================================================
--- trunk/tp/t/06columnfractions.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/06columnfractions.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -2,10 +2,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/08misc_commands.t
===================================================================
--- trunk/tp/t/08misc_commands.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/08misc_commands.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/09indices.t
===================================================================
--- trunk/tp/t/09indices.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/09indices.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/10menu.t
===================================================================
--- trunk/tp/t/10menu.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/10menu.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/16raw.t
===================================================================
--- trunk/tp/t/16raw.t  2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/16raw.t  2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/181quotation.t
===================================================================
--- trunk/tp/t/181quotation.t   2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/181quotation.t   2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/18itemize.t
===================================================================
--- trunk/tp/t/18itemize.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/18itemize.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/19def.t
===================================================================
--- trunk/tp/t/19def.t  2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/19def.t  2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/20preformatted.t
===================================================================
--- trunk/tp/t/20preformatted.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/20preformatted.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/21multitable.t
===================================================================
--- trunk/tp/t/21multitable.t   2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/21multitable.t   2018-08-13 11:41:21 UTC (rev 8055)
@@ -3,10 +3,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/22xtable.t
===================================================================
--- trunk/tp/t/22xtable.t       2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/22xtable.t       2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/25regions.t
===================================================================
--- trunk/tp/t/25regions.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/25regions.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/27float.t
===================================================================
--- trunk/tp/t/27float.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/27float.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/28heading.t
===================================================================
--- trunk/tp/t/28heading.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/28heading.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/30sectioning.t
===================================================================
--- trunk/tp/t/30sectioning.t   2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/30sectioning.t   2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/50value.t
===================================================================
--- trunk/tp/t/50value.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/50value.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/55conditionals.t
===================================================================
--- trunk/tp/t/55conditionals.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/55conditionals.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/57invalid_nestings.t
===================================================================
--- trunk/tp/t/57invalid_nestings.t     2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/57invalid_nestings.t     2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/58alias.t
===================================================================
--- trunk/tp/t/58alias.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/58alias.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/60macro.t
===================================================================
--- trunk/tp/t/60macro.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/60macro.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/70value_and_macro.t
===================================================================
--- trunk/tp/t/70value_and_macro.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/70value_and_macro.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/80include.t
===================================================================
--- trunk/tp/t/80include.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/80include.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require 'Texinfo/ModulePath.pm';
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/accents.t
===================================================================
--- trunk/tp/t/accents.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/accents.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/automatic_menus.t
===================================================================
--- trunk/tp/t/automatic_menus.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/automatic_menus.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -3,10 +3,7 @@
 use Test::More;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 BEGIN { plan tests => 5; }
 

Modified: trunk/tp/t/automatic_nodes.t
===================================================================
--- trunk/tp/t/automatic_nodes.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/automatic_nodes.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -3,10 +3,7 @@
 use Test::More;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 BEGIN { plan tests => 24; }
 

Modified: trunk/tp/t/collect_spaces.t
===================================================================
--- trunk/tp/t/collect_spaces.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/collect_spaces.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/converters_tests.t
===================================================================
--- trunk/tp/t/converters_tests.t       2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/converters_tests.t       2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/do_master_menu.t
===================================================================
--- trunk/tp/t/do_master_menu.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/do_master_menu.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/docbook_tests.t
===================================================================
--- trunk/tp/t/docbook_tests.t  2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/docbook_tests.t  2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/fix_texinfo.t
===================================================================
--- trunk/tp/t/fix_texinfo.t    2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/fix_texinfo.t    2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/html_tests.t
===================================================================
--- trunk/tp/t/html_tests.t     2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/html_tests.t     2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/index_before_item.t
===================================================================
--- trunk/tp/t/index_before_item.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/index_before_item.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/info_tests.t
===================================================================
--- trunk/tp/t/info_tests.t     2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/info_tests.t     2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/languages.t
===================================================================
--- trunk/tp/t/languages.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/languages.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/nodenormalization.t
===================================================================
--- trunk/tp/t/nodenormalization.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/nodenormalization.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/paragraph.t
===================================================================
--- trunk/tp/t/paragraph.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/paragraph.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -5,10 +5,7 @@
 use File::Basename;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 BEGIN { plan tests => 119 ; }
 

Modified: trunk/tp/t/plaintext_tests.t
===================================================================
--- trunk/tp/t/plaintext_tests.t        2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/plaintext_tests.t        2018-08-13 11:41:21 UTC (rev 8055)
@@ -2,10 +2,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';
 

Modified: trunk/tp/t/protect_character_in_texinfo.t
===================================================================
--- trunk/tp/t/protect_character_in_texinfo.t   2018-08-13 11:21:35 UTC (rev 
8054)
+++ trunk/tp/t/protect_character_in_texinfo.t   2018-08-13 11:41:21 UTC (rev 
8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/reference_to_text_in_tree.t
===================================================================
--- trunk/tp/t/reference_to_text_in_tree.t      2018-08-13 11:21:35 UTC (rev 
8054)
+++ trunk/tp/t/reference_to_text_in_tree.t      2018-08-13 11:41:21 UTC (rev 
8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/test_brace_count.t
===================================================================
--- trunk/tp/t/test_brace_count.t       2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/test_brace_count.t       2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/test_fill_gaps_in_sectioning.t
===================================================================
--- trunk/tp/t/test_fill_gaps_in_sectioning.t   2018-08-13 11:21:35 UTC (rev 
8054)
+++ trunk/tp/t/test_fill_gaps_in_sectioning.t   2018-08-13 11:41:21 UTC (rev 
8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/test_is_content_empty.t
===================================================================
--- trunk/tp/t/test_is_content_empty.t  2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/test_is_content_empty.t  2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/test_protect_hashchar_at_line_beginning.t
===================================================================
--- trunk/tp/t/test_protect_hashchar_at_line_beginning.t        2018-08-13 
11:21:35 UTC (rev 8054)
+++ trunk/tp/t/test_protect_hashchar_at_line_beginning.t        2018-08-13 
11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 

Modified: trunk/tp/t/test_sort.t
===================================================================
--- trunk/tp/t/test_sort.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/test_sort.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 use Test::More;
 BEGIN { plan tests => 6; };

Modified: trunk/tp/t/test_tree_copy.t
===================================================================
--- trunk/tp/t/test_tree_copy.t 2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/test_tree_copy.t 2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,8 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
+
 use Test::More;
 
 #BEGIN { plan tests => 3; }

Modified: trunk/tp/t/xml_tests.t
===================================================================
--- trunk/tp/t/xml_tests.t      2018-08-13 11:21:35 UTC (rev 8054)
+++ trunk/tp/t/xml_tests.t      2018-08-13 11:41:21 UTC (rev 8055)
@@ -1,10 +1,7 @@
 use strict;
 
 use lib '.';
-BEGIN {
-  require Texinfo::ModulePath;
-  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
-}
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
 
 require 't/test_utils.pl';