[8270] do not copy t/include_reference to build directory

[gavinsmith0123]

Revision: 8270
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8270
Author:   gavin
Date:     2018-10-13 03:33:02 -0400 (Sat, 13 Oct 2018)
Log Message:
-----------
do not copy t/include_reference to build directory

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/maintain/regenerate_file_lists.pl
    trunk/tp/t/80include.t
    trunk/tp/t/converters_tests.t
    trunk/tp/t/info_tests.t
    trunk/tp/t/nodenormalization.t
    trunk/tp/t/test_utils.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-09 17:59:01 UTC (rev 8269)
+++ trunk/ChangeLog     2018-10-13 07:33:02 UTC (rev 8270)
@@ -1,5 +1,27 @@
 2018-10-09  Gavin Smith  <address@hidden>
 
+       * tp/t/test_utils.pl, tp/t/nodenormalisation.t:
+       Put tp/t/include_reference in srcdir in include path.
+
+       * tp/t/80include.t (test_paths, test_include_directories): 
+       Remove tests.
+       * tp/t/converters_tests.t (verbatiminclude_paths):
+       test_include_directories): Remove tests.
+       * tp/t/info_tests.t (image_file_search): Remove test.
+       test_include_directories): Remove tests.
+
+       * maintain/regenerate_file_lists.pl: Do not generate rules to 
+       copy files to tp/t/include_dir in build directory.
+
+       This avoids the hassle of copying all the include files to the 
+       build directory for out-of-source builds and avoids the 
+       confusion of which of "t/include", "t/include_dir" or 
+       "t/include_reference" a test file is to be added to.  This 
+       feature of the test suite is not used enough IMHO to be worth 
+       the complexity.
+
+2018-10-09  Gavin Smith  <address@hidden>
+
        * configure.ac: Remove AM_CONDITIONAL for TEXI2HTML.
        * Makefile.am (dist-local): Remove reult for updating 
        translations for texi2html.

Modified: trunk/tp/maintain/regenerate_file_lists.pl
===================================================================
--- trunk/tp/maintain/regenerate_file_lists.pl  2018-10-09 17:59:01 UTC (rev 
8269)
+++ trunk/tp/maintain/regenerate_file_lists.pl  2018-10-13 07:33:02 UTC (rev 
8270)
@@ -93,8 +93,8 @@
   my $bfile = basename($include_file);
   $test_copied_include_files .= " t/include_dir/$bfile";
 
-  print INCLUDE "t/include_dir/$bfile: \$(srcdir)/$include_file 
t/include_dir\n"
-     ."\t".'$(INSTALL_DATA) $(srcdir)/'.$include_file.' $@'."\n\n";
+  #print INCLUDE "t/include_dir/$bfile: \$(srcdir)/$include_file 
t/include_dir\n"
+  #."\t".'$(INSTALL_DATA) $(srcdir)/'.$include_file.' $@'."\n\n";
 }
 
 print INCLUDE $test_copied_include_files ."\n\n";

Modified: trunk/tp/t/80include.t
===================================================================
--- trunk/tp/t/80include.t      2018-10-09 17:59:01 UTC (rev 8269)
+++ trunk/tp/t/80include.t      2018-10-13 07:33:02 UTC (rev 8270)
@@ -112,29 +112,6 @@
 
 @verbatiminclude inc_@@f--ile.texi
 '],
-['test_paths',
-'@include inc_file.texi
-
address@hidden ./t/include_dir/inc_file.texi
-
-@@include dot path.
address@hidden ./inc_file.texi 
-'],
-['test_include_directories',
-'
-@@include dot full path.
address@hidden ./t/include_dir/inc_file.texi
-
-@@include parent
address@hidden ../include_dir/inc_file.texi
-
-@@include dot full parent path
address@hidden ./tp/t/include_dir/inc_file.texi
-
address@hidden does not work in the standalone perl module
address@hidden @@include full parent path
address@hidden @include tp/t/include_dir/inc_file.texi
-',{'include_directories' => ['.', '..', 't/include_dir']}],
 ['include_comment',
 '@include address@hidden comment'],
 ['include_space_comment',

Modified: trunk/tp/t/converters_tests.t
===================================================================
--- trunk/tp/t/converters_tests.t       2018-10-09 17:59:01 UTC (rev 8269)
+++ trunk/tp/t/converters_tests.t       2018-10-13 07:33:02 UTC (rev 8270)
@@ -692,23 +692,6 @@
 
 @end example
 '],
-['verbatiminclude_paths',
-'
address@hidden inc_file.texi
-
-@@verbatiminclude dot full path.
address@hidden ./t/include_dir/inc_file.texi
-
-@@verbatiminclude parent
address@hidden ../include_dir/inc_file.texi
-
-@@verbatiminclude dot full parent path
address@hidden ./tp/t/include_dir/inc_file.texi
-
address@hidden does not work in the standalone perl module
address@hidden @@verbatiminclude full parent path
address@hidden @verbatiminclude tp/t/include_dir/inc_file.texi
-',{'include_directories' => ['.', '..', 't/include_dir']}],
 ['image_with_spaces',
 '@image{f--ile,,,@ }.
 @image{f--ile,,,@:}.

Modified: trunk/tp/t/info_tests.t
===================================================================
--- trunk/tp/t/info_tests.t     2018-10-09 17:59:01 UTC (rev 8269)
+++ trunk/tp/t/info_tests.t     2018-10-13 07:33:02 UTC (rev 8270)
@@ -200,18 +200,6 @@
 '@node Top
 @image{n_f_image}
 '],
-['image_file_search',
-'@node Top
-
address@hidden does not work in the standalone perl module
address@hidden @image{tp/t/include_dir/f--ile}
-
-@@image dot.
address@hidden/tp/t/include_dir/f--ile}
-
-@@image dot parent.
address@hidden/include_dir/f--ile}
-',{'include_directories' => ['.', '..', 't/include_dir']}],
 ['image_extension',
 '@node Top
 

Modified: trunk/tp/t/nodenormalization.t
===================================================================
--- trunk/tp/t/nodenormalization.t      2018-10-09 17:59:01 UTC (rev 8269)
+++ trunk/tp/t/nodenormalization.t      2018-10-13 07:33:02 UTC (rev 8270)
@@ -27,8 +27,7 @@
 
 my $parser = Texinfo::Parser::parser({'TEST' => 1,
                                       'include_directories' => [
-                                          't/include_dir/',
-                                          't/include/',
+                                        $srcdir.'t/include_reference/',
                                           $srcdir.'t/include/'],
                                       'expanded_formats' => ['html', 'tex']});
 

Modified: trunk/tp/t/test_utils.pl
===================================================================
--- trunk/tp/t/test_utils.pl    2018-10-09 17:59:01 UTC (rev 8269)
+++ trunk/tp/t/test_utils.pl    2018-10-13 07:33:02 UTC (rev 8270)
@@ -104,7 +104,8 @@
 }
 
 my $include_reference_dir = 't/include_reference';
-my $include_dir = 't/include_dir';
+my $include_dir = $srcdir.'t/include_reference';
+
 if (! -d $include_dir) {
   mkdir $include_dir or die "mkdir $include_dir: $!\n";
   if (opendir DIR, $include_reference_dir) {
@@ -700,11 +701,12 @@
 
   my $parser = Texinfo::Parser::parser({'TEST' => 1,
                                         'include_directories' => [
-                                          't/include_dir/',
+                                          $include_dir,
                                           't/include/',
                                           $srcdir.'t/include/'],
                                         'DEBUG' => $self->{'DEBUG'},
                                        %$parser_options});
+
   # take the initial values to record only if there is something new
   my $initial_index_names = $parser->indices_information();
   # do a copy to compare the values and not the references