[8271] do not copy t/include_reference

[gavinsmith0123]

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

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Makefile.am
    trunk/tp/t/test_utils.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-13 07:33:02 UTC (rev 8270)
+++ trunk/ChangeLog     2018-10-13 07:54:01 UTC (rev 8271)
@@ -1,5 +1,12 @@
-2018-10-09  Gavin Smith  <address@hidden>
+2018-10-13  Gavin Smith  <address@hidden>
 
+       * tp/t/test_utils.pl: Remove code copying 't/include_reference'
+       to build directory.  Do not include any directories in the 
+       current directory in the include path.
+       * tp/Makefile.am (all-local): Do not depend upon these copied files.
+
+2018-10-13  Gavin Smith  <address@hidden>
+
        * tp/t/test_utils.pl, tp/t/nodenormalisation.t:
        Put tp/t/include_reference in srcdir in include path.
 

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2018-10-13 07:33:02 UTC (rev 8270)
+++ trunk/tp/Makefile.am        2018-10-13 07:54:01 UTC (rev 8271)
@@ -196,10 +196,8 @@
 
 document_domain = $(PACKAGE)_document
 
-# $(document_strings_mo_files) and $(test_copied_include_files) come from
-# the generated makefiles Makefile.docstr and Makefile.tres.
-all-local: maintain/catalog.xml $(document_strings_mo_files) \
-           $(test_copied_include_files)
+# $(document_strings_mo_files) comes from the generated Makefile.docstr.
+all-local: maintain/catalog.xml $(document_strings_mo_files)
 
 tp_tests = prove.sh
 

Modified: trunk/tp/t/test_utils.pl
===================================================================
--- trunk/tp/t/test_utils.pl    2018-10-13 07:33:02 UTC (rev 8270)
+++ trunk/tp/t/test_utils.pl    2018-10-13 07:54:01 UTC (rev 8271)
@@ -1,7 +1,7 @@
 # $Id$
 # t/* test support for the Perl modules.
 #
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
 # Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -103,23 +103,6 @@
   }
 }
 
-my $include_reference_dir = 't/include_reference';
-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) {
-    my @files = grep {-f "$include_reference_dir/$_"} readdir DIR;
-    closedir DIR;
-    foreach my $file (@files) {
-      copy ("$include_reference_dir/$file", "$include_dir/$file")
-        or die "Copy $include_reference_dir/$file $include_dir/$file failed: 
$!\n";
-    }
-  } else {
-    die "Opendir $include_reference_dir failed: $!\n";
-  }
-}
-
 ok(1);
 
 our %formats = (
@@ -701,8 +684,7 @@
 
   my $parser = Texinfo::Parser::parser({'TEST' => 1,
                                         'include_directories' => [
-                                          $include_dir,
-                                          't/include/',
+                                          $srcdir.'t/include_reference',
                                           $srcdir.'t/include/'],
                                         'DEBUG' => $self->{'DEBUG'},
                                        %$parser_options});