[7571] use Texinfo::ModulePath in more tests

[gavinsmith0123]

Revision: 7571
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7571
Author:   gavin
Date:     2016-12-25 12:31:49 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
use Texinfo::ModulePath in more tests

Modified Paths:
--------------
    trunk/tp/Texinfo/ModulePath.pm.in
    trunk/tp/t/accents.t
    trunk/tp/t/automatic_menus.t
    trunk/tp/t/collect_spaces.t
    trunk/tp/t/do_master_menu.t
    trunk/tp/t/fix_texinfo.t
    trunk/tp/t/index_before_item.t
    trunk/tp/t/nodenormalization.t
    trunk/tp/t/test_sort.t
    trunk/tp/t/test_utils.pl

Modified: trunk/tp/Texinfo/ModulePath.pm.in
===================================================================
--- trunk/tp/Texinfo/ModulePath.pm.in   2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/Texinfo/ModulePath.pm.in   2016-12-25 12:31:49 UTC (rev 7571)
@@ -4,6 +4,8 @@
 # either in the source or build directories.
 
 package Texinfo::ModulePath;
+
+use File::Basename;
 use File::Spec;
 
 # If $LIB_DIR and $LIBEXEC_DIR are given,
@@ -19,7 +21,23 @@
 sub init (;$$) {
   my $lib_dir = shift;
   my $libexec_dir = shift;
+  my %named_args = @_;
 
+  if (!$ENV{'top_srcdir'} and !$ENV{'top_builddir'}
+      and $named_args{'updirs'}) {
+    my ($real_command_name, $command_directory, $command_suffix) 
+            = fileparse($0, '.pl');
+    my $updir = File::Spec->updir();
+
+    # e.g. tp/t -> tp/t/../.. for 'updirs' = 2.
+    my $count = $named_args{'updirs'};
+    my $top_srcdir = $command_directory;
+    while ($count-- > 0) {
+      $top_srcdir = File::Spec->catdir($top_srcdir, $updir);
+    }
+    $ENV{'top_srcdir'} = $top_srcdir;
+  }
+
   if (defined($ENV{'top_builddir'}) and !defined($ENV{'top_srcdir'})) {
     $ENV{'top_srcdir'} = $ENV{'top_builddir'};
   } elsif (!defined($ENV{'top_builddir'}) and defined($ENV{'top_srcdir'})) {

Modified: trunk/tp/t/accents.t
===================================================================
--- trunk/tp/t/accents.t        2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/accents.t        2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 63;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN { plan tests => 63; }
+
 use Texinfo::Convert::Text;
 use Texinfo::Convert::Converter;
 use Texinfo::Convert::HTML;

Modified: trunk/tp/t/automatic_menus.t
===================================================================
--- trunk/tp/t/automatic_menus.t        2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/automatic_menus.t        2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 5;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
+BEGIN { plan tests => 5; }
+
 use Texinfo::Parser qw(parse_texi_text);
 use Texinfo::Transformations;
 use Texinfo::Convert::Texinfo;

Modified: trunk/tp/t/collect_spaces.t
===================================================================
--- trunk/tp/t/collect_spaces.t 2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/collect_spaces.t 2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 15;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN { plan tests => 15; }
+
 use Texinfo::Parser;
 use Texinfo::Convert::Converter;
 

Modified: trunk/tp/t/do_master_menu.t
===================================================================
--- trunk/tp/t/do_master_menu.t 2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/do_master_menu.t 2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 5;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN { plan tests => 5; }
+
 use Texinfo::Parser qw(parse_texi_text);
 use Texinfo::Transformations;
 use Texinfo::Convert::Texinfo;

Modified: trunk/tp/t/fix_texinfo.t
===================================================================
--- trunk/tp/t/fix_texinfo.t    2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/fix_texinfo.t    2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 4;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN { plan tests => 4; }
+
 use Texinfo::Parser;
 use Texinfo::Convert::Texinfo;
 

Modified: trunk/tp/t/index_before_item.t
===================================================================
--- trunk/tp/t/index_before_item.t      2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/index_before_item.t      2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 6;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN { plan tests => 6; }
+
 use Texinfo::Parser qw(parse_texi_text);
 use Texinfo::Common qw(move_index_entries_after_items_in_tree);
 use Texinfo::Convert::Texinfo;

Modified: trunk/tp/t/nodenormalization.t
===================================================================
--- trunk/tp/t/nodenormalization.t      2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/nodenormalization.t      2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,14 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 8;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
+BEGIN { plan tests => 8; }
+
 use Texinfo::Convert::NodeNameNormalization qw(normalize_node 
transliterate_texinfo);
 use Texinfo::Parser;
 use Data::Dumper;

Modified: trunk/tp/t/test_sort.t
===================================================================
--- trunk/tp/t/test_sort.t      2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/test_sort.t      2016-12-25 12:31:49 UTC (rev 7571)
@@ -1,19 +1,13 @@
 use strict;
 
+BEGIN {
+  require Texinfo::ModulePath;
+  Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
+}
+
 use Test::More;
-use File::Spec;
-BEGIN { plan tests => 6;
-        if (defined($ENV{'top_srcdir'})) {
-          unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-          my $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 
'maintain');
-          unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'),
-                         File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
-      }};
+BEGIN { plan tests => 6; };
 
-use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
-use lib 'maintain/lib/libintl-perl/lib/';
-use lib 'maintain/lib/Text-Unidecode/lib/';
 use Texinfo::Convert::Text;
 use Texinfo::Parser;
 use Texinfo::Structuring;

Modified: trunk/tp/t/test_utils.pl
===================================================================
--- trunk/tp/t/test_utils.pl    2016-12-24 16:26:42 UTC (rev 7570)
+++ trunk/tp/t/test_utils.pl    2016-12-25 12:31:49 UTC (rev 7571)
@@ -23,21 +23,10 @@
 
 use 5.006;
 
-use File::Basename;
-use File::Spec;
-
 BEGIN {
 
-if (!$ENV{'top_srcdir'}) {
-  my ($real_command_name, $command_directory, $command_suffix) 
-     = fileparse($0, '.pl');
-  my $updir = File::Spec->updir();
-
-  # tp/t -> tp/t/../..
-  $ENV{'top_srcdir'} = File::Spec->catdir($command_directory, $updir, $updir);
-}
 require Texinfo::ModulePath;
-Texinfo::ModulePath::init();
+Texinfo::ModulePath::init(undef, undef, 'updirs' => 2);
 
 } # end BEGIN