texinfo ChangeLog configure.ac Pod-Simple-Texin...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/10 16:59:03

Modified files:
        .              : ChangeLog configure.ac 
        Pod-Simple-Texinfo: .cvsignore 
        install-info   : .cvsignore 
        install-info/tests: .cvsignore 
        tp             : .cvsignore 
        tp/tests       : .cvsignore 
        tp/tests/many_input_files: .cvsignore 
Added files:
        build-aux      : test-driver 

Log message:
        switch to automake parallel-tests per stefano

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1433&r2=1.1434
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/.cvsignore?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/build-aux/test-driver?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/.cvsignore?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/.cvsignore?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/.cvsignore?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/.cvsignore?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/.cvsignore?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1433
retrieving revision 1.1434
diff -u -b -r1.1433 -r1.1434
--- ChangeLog   9 Nov 2012 16:36:10 -0000       1.1433
+++ ChangeLog   10 Nov 2012 16:59:02 -0000      1.1434
@@ -1,3 +1,9 @@
+2012-11-10  Karl Berry  <address@hidden>
+
+       * configure.ac (AM_INIT_AUTOMAKE): use parallel-tests,
+       as recommended by Stefano Lattarini.  Require automake 1.12.
+       * build-aux/test-driver: new file to support it.
+
 2012-11-09  Karl Berry  <address@hidden>
 
        * configure.ac: remove MKDIR_P fallback.

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- configure.ac        9 Nov 2012 16:36:11 -0000       1.118
+++ configure.ac        10 Nov 2012 16:59:02 -0000      1.119
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.118 2012/11/09 16:36:11 karl Exp $
+# $Id: configure.ac,v 1.119 2012/11/10 16:59:02 karl Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
@@ -16,8 +16,9 @@
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])
-dnl tar-ustar because we have long filenames for some test files
-AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-xz tar-ustar])
+dnl tar-ustar because we have long filenames for some test files.
+dnl parallel-tests as recommended by stefano.
+AM_INIT_AUTOMAKE([1.12 tar-ustar parallel-tests readme-alpha dist-xz])
 
 # Minimum Autoconf version required.
 AC_PREREQ(2.59)

Index: Pod-Simple-Texinfo/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Pod-Simple-Texinfo/.cvsignore       19 Jan 2012 20:38:10 -0000      1.1
+++ Pod-Simple-Texinfo/.cvsignore       10 Nov 2012 16:59:02 -0000      1.2
@@ -1,3 +1,5 @@
+*.log
+*.trs
 Makefile.in
 Makefile
 pod2texi

Index: install-info/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- install-info/.cvsignore     2 Jan 2008 01:36:16 -0000       1.1
+++ install-info/.cvsignore     10 Nov 2012 16:59:03 -0000      1.2
@@ -1,3 +1,5 @@
+*.log
+*.trs
 .deps
 Makefile
 Makefile.in

Index: install-info/tests/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- install-info/tests/.cvsignore       17 Apr 2008 17:54:16 -0000      1.2
+++ install-info/tests/.cvsignore       10 Nov 2012 16:59:03 -0000      1.3
@@ -1,3 +1,5 @@
+*.log
+*.trs
 Makefile
 Makefile.in
 defs

Index: tp/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/.cvsignore       20 May 2012 18:50:40 -0000      1.9
+++ tp/.cvsignore       10 Nov 2012 16:59:03 -0000      1.10
@@ -1,14 +1,15 @@
 LocaleData
 Makefile
+Makefile.documents_strings_mo_files
 Makefile.in
 Makefile.tres
-Makefile.documents_strings_mo_files
 Texinfo-*.tar.gz
 blib
 pm_to_blib
-texi2any
-texi_sort_elements_count
 po
 po_document
-texi2any-perl
 t_texis
+test-suite.log
+texi2any
+texi2any-perl
+texi_sort_elements_count

Index: tp/tests/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/.cvsignore 15 Jan 2012 17:12:04 -0000      1.1
+++ tp/tests/.cvsignore 10 Nov 2012 16:59:03 -0000      1.2
@@ -1,3 +1,5 @@
+*.log
+*.trs
 Makefile
 Makefile.in
 path_separator

Index: tp/tests/many_input_files/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/many_input_files/.cvsignore        14 Jan 2012 19:04:26 -0000      
1.1
+++ tp/tests/many_input_files/.cvsignore        10 Nov 2012 16:59:03 -0000      
1.2
@@ -1,5 +1,6 @@
 *.log
 *.out
+*.trs
 diffs
 Makefile
 Makefile.in

Index: build-aux/test-driver
===================================================================
RCS file: build-aux/test-driver
diff -N build-aux/test-driver
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ build-aux/test-driver       10 Nov 2012 16:59:02 -0000      1.1
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic driver script for the 'parallel-tests' mode.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <address@hidden> or send patches to
+# <address@hidden>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End: