[7574] use Texinfo::ModulePath in more tests

[gavinsmith0123]

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

Modified Paths:
--------------
    trunk/ChangeLog
    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_tree_copy.t

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-12-25 12:42:56 UTC (rev 7573)
+++ trunk/ChangeLog     2016-12-25 13:01:05 UTC (rev 7574)
@@ -1,5 +1,14 @@
 2016-12-25  Gavin Smith  <address@hidden>
 
+       * tp/t/protect_character_in_texinfo.t,
+       tp/t/reference_to_text_in_tree.t, tp/t/test_brace_count.t, 
+       tp/t/test_fill_gaps_in_sectioning.t, 
+       tp/t/test_is_content_empty.t,
+       tp/t/test_protect_hashchar_at_line_beginning.t: Use 
+       Texinfo::ModulePath.
+
+2016-12-25  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <@menu> Check if parent
        command is defined before using it as a hash key.
 

Modified: trunk/tp/t/protect_character_in_texinfo.t
===================================================================
--- trunk/tp/t/protect_character_in_texinfo.t   2016-12-25 12:42:56 UTC (rev 
7573)
+++ trunk/tp/t/protect_character_in_texinfo.t   2016-12-25 13:01:05 UTC (rev 
7574)
@@ -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 qw(parse_texi_text);
 use Texinfo::Common qw(protect_comma_in_tree protect_colon_in_tree
       protect_node_after_label_in_tree);

Modified: trunk/tp/t/reference_to_text_in_tree.t
===================================================================
--- trunk/tp/t/reference_to_text_in_tree.t      2016-12-25 12:42:56 UTC (rev 
7573)
+++ trunk/tp/t/reference_to_text_in_tree.t      2016-12-25 13:01:05 UTC (rev 
7574)
@@ -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 => 2;
-        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 => 2; }
+
 use Texinfo::Parser qw(parse_texi_text);
 use Texinfo::Transformations;
 use Texinfo::Convert::Texinfo;

Modified: trunk/tp/t/test_brace_count.t
===================================================================
--- trunk/tp/t/test_brace_count.t       2016-12-25 12:42:56 UTC (rev 7573)
+++ trunk/tp/t/test_brace_count.t       2016-12-25 13:01:05 UTC (rev 7574)
@@ -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 => 7;
-        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 => 7; }
+
 use Texinfo::Parser qw(parse_texi_text);
 use Texinfo::Common;
 

Modified: trunk/tp/t/test_fill_gaps_in_sectioning.t
===================================================================
--- trunk/tp/t/test_fill_gaps_in_sectioning.t   2016-12-25 12:42:56 UTC (rev 
7573)
+++ trunk/tp/t/test_fill_gaps_in_sectioning.t   2016-12-25 13:01:05 UTC (rev 
7574)
@@ -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::Transformations;
 use Texinfo::Parser qw(parse_texi_text);
 use Texinfo::Convert::Texinfo;

Modified: trunk/tp/t/test_is_content_empty.t
===================================================================
--- trunk/tp/t/test_is_content_empty.t  2016-12-25 12:42:56 UTC (rev 7573)
+++ trunk/tp/t/test_is_content_empty.t  2016-12-25 13:01:05 UTC (rev 7574)
@@ -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 => 10;
-        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 => 12; }
+
 use Texinfo::Parser qw(parse_texi_text);
 #use Texinfo::Convert::Texinfo;
 use Texinfo::Common;

Modified: trunk/tp/t/test_protect_hashchar_at_line_beginning.t
===================================================================
--- trunk/tp/t/test_protect_hashchar_at_line_beginning.t        2016-12-25 
12:42:56 UTC (rev 7573)
+++ trunk/tp/t/test_protect_hashchar_at_line_beginning.t        2016-12-25 
13:01:05 UTC (rev 7574)
@@ -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(protect_hashchar_at_line_beginning);
 use Texinfo::Convert::Texinfo;

Modified: trunk/tp/t/test_tree_copy.t
===================================================================
--- trunk/tp/t/test_tree_copy.t 2016-12-25 12:42:56 UTC (rev 7573)
+++ trunk/tp/t/test_tree_copy.t 2016-12-25 13:01:05 UTC (rev 7574)
@@ -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 => 3;
-        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 => 3; }
+
 use Texinfo::Parser;
 use Texinfo::Convert::Texinfo;
 use Data::Dumper;