texinfo ChangeLog configure.ac tp/Makefile.am t...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/02/09 21:24:21

Modified files:
        .              : ChangeLog configure.ac 
        tp             : Makefile.am 
        tp/maintain    : regenerate_file_lists.pl 
        tp/t           : .cvsignore 

Log message:
                * configure.ac, tp/Makefile.am, 
tp/maintain/regenerate_file_lists.pl:
                prepare for running directly tap tests in Makefile.am.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1544&r2=1.1545
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_file_lists.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/.cvsignore?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1544
retrieving revision 1.1545
diff -u -b -r1.1544 -r1.1545
--- ChangeLog   7 Feb 2013 18:19:28 -0000       1.1544
+++ ChangeLog   9 Feb 2013 21:24:21 -0000       1.1545
@@ -1,3 +1,8 @@
+2013-02-09  Patrice Dumas  <address@hidden>
+
+       * configure.ac, tp/Makefile.am, tp/maintain/regenerate_file_lists.pl:
+       prepare for running directly tap tests in Makefile.am.
+
 2013-02-07  Karl Berry  <address@hidden>
 
        * contrib/booklet.mak: new contribution from John Darrington.

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- configure.ac        5 Feb 2013 00:49:28 -0000       1.141
+++ configure.ac        9 Feb 2013 21:24:21 -0000       1.142
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.141 2013/02/05 00:49:28 karl Exp $
+# $Id: configure.ac,v 1.142 2013/02/09 21:24:21 pertusus Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 # 2012, 2013 Free Software Foundation, Inc.
@@ -70,6 +70,9 @@
   AC_MSG_ERROR([perl >= 5.7.3 with Encode required by Texinfo.])
 fi
 
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AC_PROG_AWK
+
 # Checks for programs.
 AC_PROG_CC
 

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- tp/Makefile.am      3 Feb 2013 23:53:48 -0000       1.57
+++ tp/Makefile.am      9 Feb 2013 21:24:21 -0000       1.58
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.57 2013/02/03 23:53:48 karl Exp $
+# $Id: Makefile.am,v 1.58 2013/02/09 21:24:21 pertusus Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011, 2012, 2013 Free Software Foundation, Inc.
@@ -164,8 +164,15 @@
 
 if TP_TESTS
 TESTS = $(tp_tests)
+#TESTS = $(test_tap_files_generated_list)
 endif
 
+TEST_EXTENSIONS = .t
+T_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                       $(top_srcdir)/build-aux/tap-driver.sh
+T_LOG_COMPILER = $(PERL)
+AM_T_LOG_FLAGS = -w
+
 maintenance_files = \
   maintain/all_tests.sh \
   maintain/change_perl_modules_version.sh \

Index: tp/maintain/regenerate_file_lists.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/regenerate_file_lists.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tp/maintain/regenerate_file_lists.pl        3 Feb 2013 23:53:48 -0000       
1.13
+++ tp/maintain/regenerate_file_lists.pl        9 Feb 2013 21:24:21 -0000       
1.14
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# $Id: regenerate_file_lists.pl,v 1.13 2013/02/03 23:53:48 karl Exp $
+# $Id: regenerate_file_lists.pl,v 1.14 2013/02/09 21:24:21 pertusus Exp $
 # Copyright 2011, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -23,23 +23,30 @@
 use File::Basename;
 use File::Spec;
 
-my %files;
-
 my ($command, $mydir, $suffix) = fileparse($0);
 my $parent = File::Spec->catdir($mydir, File::Spec->updir());
 chdir($parent) || die "chdir $parent: $!";
 -d "t" || (die "goodbye, no t directory in " . `pwd`);
 
+my %files;
 find (\&wanted, ('t'));
 sub wanted 
 {
   if ((/\.pl$/ and $File::Find::dir =~ m:^t/results/[^/]+:)
-      or (/\.t$/ and $File::Find::dir =~ /t$/)
       or (!/^CVS$/ and $File::Find::dir =~ 
m:^t/results/[^/]+/[^/]+/res_[^/]+$:)) {
     $files{$File::Find::name} = 1;
   }
 }
 
+my %tap_files;
+find (\&wanted_tap_files, ('t'));
+sub wanted_tap_files
+{
+  if (/\.t$/ and $File::Find::dir =~ /t$/) {
+    $tap_files{$File::Find::name} = 1;
+  }
+}
+
 my %include_files;
 find (\&wanted_include_files, ('t'));
 sub wanted_include_files
@@ -65,7 +72,13 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOH
 
-print INCLUDE "test_files_generated_list =";
+print INCLUDE 'test_tap_files_generated_list =';
+foreach my $file (sort(keys(%tap_files))) {
+  print INCLUDE " \\\n  $file";
+}
+print INCLUDE "\n\n";
+
+print INCLUDE 'test_files_generated_list = $(test_tap_files_generated_list)';
 foreach my $file (sort(keys(%files)), sort(keys(%include_files))) {
   print INCLUDE " \\\n  $file";
 }

Index: tp/t/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/t/.cvsignore     28 Jan 2012 13:21:16 -0000      1.2
+++ tp/t/.cvsignore     9 Feb 2013 21:24:21 -0000       1.3
@@ -1,3 +1,5 @@
 include_dir
 locales
 output_files
+*.trs
+*.log