automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1990


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1990-gc93cb22
Date: Tue, 21 Feb 2012 12:30:52 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=c93cb22ead78766bafdf323d52c2ee25a8dcba25

The branch, master has been updated
       via  c93cb22ead78766bafdf323d52c2ee25a8dcba25 (commit)
       via  deb7773835c02531a7cccc8a7bc7f80959b31872 (commit)
       via  82616f0bc3340449ebb7d5e1e40cca40644e8b74 (commit)
       via  101216cad25855e236e29c73c7d8781c5a94f598 (commit)
       via  86deab4df2aabc9fb23125cff2dd68af7ef963b4 (commit)
      from  72cae0a53cde58c5f5ac1020555a675498191b85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c93cb22ead78766bafdf323d52c2ee25a8dcba25
Author: Stefano Lattarini <address@hidden>
Date:   Tue Feb 21 10:03:17 2012 +0100

    cosmetics: few typofixes

commit deb7773835c02531a7cccc8a7bc7f80959b31872
Author: Stefano Lattarini <address@hidden>
Date:   Mon Feb 20 18:33:50 2012 +0100

    automake: new option 'serial-tests'
    
    Currently, automake offers a 'parallel-tests' option to enable the
    use of the parallel testsuite harness in the generated Makefiles,
    but no option to explicitly state the intention of using the older
    serial testsuite driver (which is currently the default).
    
    This makes the parallel test harness seems like a second-class
    citizen (while actually it should be the other way around); more
    importantly, it will prevent us from making the parallel harness
    be the default one in future automake versions, since the users
    of the serial harness would then have no way to instruct automake
    to continue using it.
    
    We solve all of this by introducing a new 'serial-tests' option.
    
    * lib/Automake/Options.pm (_process_option_list): Recognize the
    new option, and related minor refactoring.
    * tests/serial-tests.test: New test.
    * tests/list-of-tests.mk: Add it.
    * doc/automake.texi: Update.
    * NEWS: Likewise.

commit 82616f0bc3340449ebb7d5e1e40cca40644e8b74
Author: Stefano Lattarini <address@hidden>
Date:   Mon Feb 20 14:04:46 2012 +0100

    tests: fix a timestamp issue, and other minor buglets
    
    Reported by Panther Martin in automake bug#10848.
    
    * tests/conffile-leading-dot.test: Add a proper '$sleep' invocation,
    to avoid spurious failures on fast systems without sub-second
    timestamp resolutions.  Add other minor related and unrelated
    improvements and fixlets since we are at it.

commit 101216cad25855e236e29c73c7d8781c5a94f598
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 19 18:43:28 2012 +0100

    automake: new option to print location of scripts and data files
    
    With this change, we add a new automake option '--print-libdir'
    that prints (on stdout) the path of the directory containing the
    Automake-provided scripts (e.g., 'missing' and 'install-sh') and
    data files (e.g., INSTALL or texinfo.tex).
    
    Suggestion by Nick Bowler.  See also automake bug#10473.
    
    * automake.in (parse_arguments): Handle the new option.
    (usage): Mention it.
    * doc/automake.texi (automake Invocation): Document it.
    * NEWS: Update.
    * tests/print-dir.test: New test.
    * tests/list-of-tests.mk: Add it.

commit 86deab4df2aabc9fb23125cff2dd68af7ef963b4
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 19 17:12:55 2012 +0100

    docs: prefer the awk+sh TAP driver over the perl one
    
    We had completed our shell+awk implementation of the TAP driver
    months ago, but never documented it in the manual, continuing to
    document only the "prototype" written in perl instead.  Time to
    fix this, before the 1.12 release.
    
    * doc/automake.texi (Use TAP with the Automake test harness): Now
    we document the use of the awk+shell implementation of our TAP
    driver, rather than of the perl one.
    * tests/tap-doc2.test: Adjust to use the shell+awk implementation
    of the TAP driver.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.09                              |    2 +-
 ChangeLog.11                              |    2 +-
 NEWS                                      |   14 ++++-
 THANKS                                    |    1 +
 automake.in                               |    4 +-
 contrib/multilib/config-ml.in             |    2 +-
 doc/automake.texi                         |   58 ++++++++++++-------
 lib/Automake/Options.pm                   |   11 +++-
 tests/conffile-leading-dot.test           |   15 +++--
 tests/list-of-tests.mk                    |    2 +
 tests/{symlink.test => print-libdir.test} |   28 ++++++----
 tests/serial-tests.test                   |   86 +++++++++++++++++++++++++++++
 tests/tap-doc2.test                       |   11 ++--
 13 files changed, 182 insertions(+), 54 deletions(-)
 copy tests/{symlink.test => print-libdir.test} (59%)
 create mode 100755 tests/serial-tests.test

diff --git a/ChangeLog.09 b/ChangeLog.09
index 2238005..02a1e33 100644
--- a/ChangeLog.09
+++ b/ChangeLog.09
@@ -4088,7 +4088,7 @@
        * automake.in (%_macro_for_cond): New variable.
        (cond_stack_if): Use it for better error message about
        missing dependency tracking conditionals.
-       * tests/asm2.test: New test, modeled after asm.test.
+       * tests/asm2.test: New test, modelled after asm.test.
        * tests/Makefile.am: Adjust.
        Report by Ralf Corsepius.
 
diff --git a/ChangeLog.11 b/ChangeLog.11
index a5c3a95..ce9d2b8 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -12842,7 +12842,7 @@
 
        Make test `aclocal3.test' stricter.
        * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
-       succeds unexpectedly.
+       succeeds unexpectedly.
 
        Add tests checking that symlinks are resolved by `make dist'.
        * tests/distlinks.test: New test.
diff --git a/NEWS b/NEWS
index c1de9b2..c322f42 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,11 @@ New in 1.11a:
 
 * Changes to Automake-generated testsuite harnesses:
 
+  - The new automake option 'serial-tests' has been introduced.  It can
+    be used to explicitly instruct automake to use the older serial
+    testsuite harness.  This is still the default at the moment, but it
+    might change in future versions.
+
   - Test scripts that exit with status 99 to signal an "hard error" (e.g.,
     and unexpected or internal error, or a failure to set up the test case
     scenario) have their outcome reported as an 'ERROR' now.  Previous
@@ -116,6 +121,9 @@ New in 1.11a:
 
 * Miscellaneous changes:
 
+  - Automake has a new option '--print-libdir' that prints the path of the
+    directory containing the Automake-provided scripts and data files.
+
   - The `dist' and `dist-all' targets now can run compressors in parallel.
 
   - Automake can now generate silenced rules for texinfo outputs.
@@ -187,7 +195,7 @@ Bugs fixed in 1.11a:
     if those warnings are by default disabled in `foreign' strictness.
 
 
-New in 1.11.2a:
+New in 1.11.3:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -233,7 +241,7 @@ New in 1.11.2a:
   - The last relics of Python 1.5 support have been removed from the
     AM_PATH_PYTHON macro.
 
-Bugs fixed in 1.11.2a:
+Bugs fixed in 1.11.3:
 
 * Long-standing bugs:
 
@@ -1524,7 +1532,7 @@ Bugs fixed in 1.7.2:
   and augmented in another condition.
 * Fix ansi2knr rules for LIBOBJS sources.
 * Clean all known Texinfo index files, not only those which appear to
-  be used, because we cannot know wich indexes are used in included files.
+  be used, because we cannot know which indexes are used in included files.
   (PR/375, Debian Bug #168671)
 * Honor only the first @setfilename seen in a Texinfo file.
 * Treat "required file X not found" diagnostics as errors (exit status 1).
diff --git a/THANKS b/THANKS
index 3d1f75a..36f8f4b 100644
--- a/THANKS
+++ b/THANKS
@@ -267,6 +267,7 @@ Olivier Louchart-Fletcher address@hidden
 Olly Betts             address@hidden
 Oren Ben-Kiki          address@hidden
 Owen Taylor            address@hidden
+Panther Martin         address@hidden
 Patrick Welche         address@hidden
 Patrik Weiskircher     address@hidden
 Paul Berrevoets                address@hidden
diff --git a/automake.in b/automake.in
index 5ee9f8a..13e65df 100644
--- a/automake.in
+++ b/automake.in
@@ -8268,7 +8268,8 @@ Flavors:
 
 Library files:
   -a, --add-missing      add missing standard files to package
-      --libdir=DIR       directory storing library files
+      --libdir=DIR       set directory storing library files
+      --print-libdir     print directory storing library files
   -c, --copy             with -a, copy missing files (default is symlink)
   -f, --force-missing    force update of standard files
 
@@ -8327,6 +8328,7 @@ sub parse_arguments ()
      'version' => \&version,
      'help'    => \&usage,
      'libdir=s'        => \$libdir,
+     'print-libdir'     => sub { print "$libdir\n"; exit 0; },
      'gnu'             => sub { $strict = 'gnu'; },
      'gnits'           => sub { $strict = 'gnits'; },
      'foreign'         => sub { $strict = 'foreign'; },
diff --git a/contrib/multilib/config-ml.in b/contrib/multilib/config-ml.in
index a68a005..0734a95 100644
--- a/contrib/multilib/config-ml.in
+++ b/contrib/multilib/config-ml.in
@@ -50,7 +50,7 @@
 # To implement this, a symlink tree is built for each library and for each
 # multilib subdir.
 #
-# The build tree is layed out as
+# The build tree is laid out as
 #
 # ./
 #   newlib
diff --git a/doc/automake.texi b/doc/automake.texi
index 8b1a84b..3e6a2bf 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2587,6 +2587,12 @@ for more information.
 Look for Automake data files in directory @var{dir} instead of in the
 installation directory.  This is typically used for debugging.
 
address@hidden --print-libdir
address@hidden --print-libdir
+Print the path of the installation directory containing Automake-provided
+scripts and data files (like e.g., @file{texinfo.texi} and
address@hidden).
+
 @item -c
 @opindex -c
 @itemx --copy
@@ -8921,15 +8927,18 @@ by the tests, not the tests themselves.  Of course you 
can set
 
 @node Serial Test Harness
 @subsection Serial Test Harness
address@hidden @option{serial-tests}, Using
 
 @emph{NOTE:} This harness, while still being the default one, is
-obsolescent, and kept mostly for backward-compatibility reasons.
-The user is advised to use the parallel test harness instead
-(@pxref{Parallel Test Harness}).
-
-The serial harness operates by simply running the tests serially, one at
-the time, without any I/O redirection.  It's up to the user to implement
-logging of tests' output, if that's requited or desired.
+obsolescent, and kept mostly for backward-compatibility reasons.  The user
+is advised to use the parallel test harness instead (@pxref{Parallel Test
+Harness}).  Be warned that future Automake versions might switch to use
+that more modern and feature-rich harness by default.
+
+The serial test harness is enabled by the Automake option
address@hidden It operates by simply running the tests serially,
+one at the time, without any I/O redirection.  It's up to the user to
+implement logging of tests' output, if that's requited or desired.
 @c TODO: give an example of how this can be done.
 
 For historical and implementation reasons, the @code{AM_TESTS_ENVIRONMENT}
@@ -9559,19 +9568,18 @@ use TAP in their testsuite.
 @node Use TAP with the Automake test harness
 @subsection Use TAP with the Automake test harness
 
-Currently, the TAP driver that comes with Automake requires a perl
-interpreter to work, and requires various by-hand steps on the
-developer's part (this should be fixed in future Automake versions).
-You'll have grab the @file{tap-driver.pl} script from the Automake
-distribution by hand, copy it in your source tree, add code to
address@hidden to search a perl interpreter and to define the
address@hidden(PERL)} variable accordingly, and use the Automake support
-for third-party test drivers to instruct the harness to use the
address@hidden to run your TAP-producing tests.  See the example
+Currently, the TAP driver that comes with Automake requires some by-hand
+steps on the developer's part (this situation should hopefully be improved
+in future Automake versions).  You'll have grab the @file{tap-driver.sh}
+script from the Automake distribution by hand, copy it in your source tree,
+add a call to @code{AC_PROG_AWK} in @file{configure.ac} to search for a
+proper awk program, and use the Automake support for third-party test
+drivers to instruct the harness to use the @file{tap-driver.sh} script
+and that awk program to run your TAP-producing tests.  See the example
 below for clarification.
 
 Apart from the options common to all the Automake test drivers
-(@pxref{Command-line arguments for test drivers}), the @file{tap-driver.pl}
+(@pxref{Command-line arguments for test drivers}), the @file{tap-driver.sh}
 supports the following options, whose names are chosen for enhanced
 compatibility with the @command{prove} utility.
 
@@ -9621,14 +9629,13 @@ AC_INIT([GNU Try Tap], [1.0], [bug-automake@@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign parallel-tests -Wall -Werror])
 AC_CONFIG_FILES([Makefile])
-AC_REQUIRE_AUX_FILE([tap-driver.pl])
-AC_PATH_PROG([PERL], [perl])
-test -n "$PERL" || AC_MSG_ERROR([perl not found])
-$PERL -MTAP::Parser -e 1 || AC_MSG_ERROR([TAP::Parser not found])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AC_PROG_AWK
 AC_OUTPUT
 
 % @kbd{cat Makefile.am}
-TEST_LOG_DRIVER = $(PERL) $(srcdir)/build-aux/tap-driver.pl
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                  $(top_srcdir)/build-aux/tap-driver.sh
 TESTS = foo.test bar.test baz.test
 EXTRA_DIST = $(TESTS)
 
@@ -10135,6 +10142,13 @@ this directory.
 Enable test suite harness for @code{TESTS} that can run tests in parallel
 (@pxref{Parallel Test Harness}, for more information).
 
address@hidden @option{serial-tests}
address@hidden Option, @option{serial-tests}
address@hidden serial-tests
+Enable the older serial test suite harness for @code{TESTS} (@pxref{Serial
+Test Harness}, for more information).  This is still the default for the
+moment.
+
 @item @option{readme-alpha}
 @cindex Option, @option{readme-alpha}
 @opindex readme-alpha
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 642f337..eee76db 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -276,6 +276,15 @@ sub _process_option_list (\%@)
           error ($where, "support for lzma-compressed distribution " .
                          "archives has been removed");
         }
+      elsif ($_ eq 'parallel-tests')
+        {
+          # Just recognize it explicitly.
+        }
+      elsif ($_ eq 'serial-tests')
+        {
+          # This is a little of an hack, but good enough for the moment.
+         delete $options->{'parallel-tests'};
+        }
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
             || $_ eq 'dist-shar' || $_ eq 'dist-zip'
             || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
@@ -286,7 +295,7 @@ sub _process_option_list (\%@)
             || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
             || $_ eq 'no-exeext' || $_ eq 'no-define'
             || $_ eq 'std-options'
-            || $_ eq 'color-tests' || $_ eq 'parallel-tests'
+            || $_ eq 'color-tests' 
             || $_ eq 'cygnus' || $_ eq 'no-dependencies')
        {
          # Explicitly recognize these.
diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
index bfe81b5..732e10f 100755
--- a/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@ -29,9 +29,7 @@ AC_CONFIG_FILES([./foo:a.in:b.in:c.in])
 AC_OUTPUT
 END
 
-echo foo = barbarbar > Makefile.am
-
-touch a.in b.in c.in
+touch a.in b.in c.in Makefile.am
 
 $ACLOCAL
 
@@ -44,16 +42,19 @@ grep "^configure\.in:4:.* omit leading '\\./'" stderr
 grep "^configure\.in:4:.*remake rules might be subtly broken" stderr
 
 # Check that our warning was actually justified.
+sed 's/^AM_INIT_AUTOMAKE/&([-Wall -Wno-unsupported])/' <configure.in >t
+mv -f t configure.in
+rm -rf autom4te*.cache
+$ACLOCAL
 $AUTOCONF
 $AUTOMAKE -Wall -Wno-unsupported
 ./configure
 $MAKE
-grep barbarbar Makefile
-# No need to sleep here, configure did that for us already.
-echo foo = bazbazbaz > Makefile.am
+$sleep
+touch Makefile.am
 # Check that remake rules do truly break -- otherwise automake is
 # giving a bogus warning.
-$MAKE 2>stderr && { cat stderr >&2 Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep "config\\.status:.*invalid argument.*Makefile" stderr
 
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index a80879f..f19c930 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -688,6 +688,7 @@ override-suggest-local.test \
 parallel-am.test \
 parallel-am2.test \
 parallel-am3.test \
+serial-tests.test \
 parallel-tests.test \
 parallel-tests2.test \
 parallel-tests3.test \
@@ -813,6 +814,7 @@ primary-prefix-invalid-couples.tap \
 primary-prefix-valid-couples.test \
 primary-prefix-couples-force-valid.test \
 primary-prefix-couples-documented-valid.test \
+print-libdir.test \
 proginst.test \
 programs-primary-rewritten.test \
 py-compile-basic.test \
diff --git a/tests/symlink.test b/tests/print-libdir.test
similarity index 59%
copy from tests/symlink.test
copy to tests/print-libdir.test
index 1936d07..f5764b3 100755
--- a/tests/symlink.test
+++ b/tests/print-libdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# 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
@@ -14,27 +14,33 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure we get an error if symlink creation fails.
-# Reported by Joerg-Martin Schwarz.
+# Test on automake options '--print-data-dir' and '--print-script-dir'.
 
 am_create_testdir=empty
 . ./defs || Exit 1
 
+libdir=`$AUTOMAKE --print-libdir` || Exit 1
+case $libdir in /*);; *) Exit 1;; esac
+test -d "$libdir"
+test "$libdir" = "$am_pkgvdatadir"
+test "$libdir" = "$am_scriptdir"
+
 : > Makefile.am
 
-cat > configure.in << 'END'
-AC_INIT([symlink], [1.0])
-AC_CONFIG_AUX_DIR([subdir])
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE
 AC_CONFIG_FILES([Makefile])
 END
 
-$ACLOCAL
-AUTOMAKE_fails --add-missing
+touch ChangeLog README NEWS AUTHORS COPYING
 
-grep '^configure\.in:3: .*missing.*error while making link' stderr
-grep '^configure\.in:3: .*install-sh.*error while making link' stderr
+$ACLOCAL
+$AUTOMAKE --gnu --add-missing
+ls -l
 
-test `$FGREP -c 'error while making link' stderr` -eq 2
+diff missing "$libdir"/missing
+diff INSTALL "$libdir"/INSTALL
 
 :
diff --git a/tests/serial-tests.test b/tests/serial-tests.test
new file mode 100755
index 0000000..680513f
--- /dev/null
+++ b/tests/serial-tests.test
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 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/>.
+
+# Option 'serial-tests'.
+
+# To avoid useless generation of a sibling test.
+am_parallel_tests=yes
+am_create_testdir=empty
+. ./defs || Exit 1
+
+hasnt_parallel_tests ()
+{
+  $EGREP 'TEST_SUITE_LOG|TEST_LOGS|\.log.*:' $1 && Exit 1
+  grep 'recheck.*:' $1 && Exit 1
+  grep '^check-TESTS: \$(TESTS)$' $1
+}
+
+has_parallel_tests ()
+{
+  $EGREP '(^| )check-TESTS.*:' $1
+  $EGREP '(^| )recheck.*:' $1
+  grep '^\$(TEST_SUITE_LOG): \$(TEST_LOGS)$' $1
+  grep '^\.test\.log:$' $1
+}
+
+mkdir one two
+
+cat >> one/configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([serial-tests])
+AC_CONFIG_FILES([Makefile])
+END
+
+echo 'TESTS = foo.test bar.test' > one/Makefile.am
+
+cat >> two/configure.ac <<END
+AC_INIT([$me], [2.0])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([parallel-tests])
+AC_CONFIG_FILES([aMakefile bMakefile])
+END
+
+cp one/Makefile.am two/aMakefile.am
+cat - one/Makefile.am > two/bMakefile.am <<END
+AUTOMAKE_OPTIONS = serial-tests
+END
+
+cd one
+touch missing install-sh
+$ACLOCAL
+$AUTOMAKE
+grep TEST Makefile.in # For debugging.
+hasnt_parallel_tests Makefile.in
+test ! -r test-driver
+cd ..
+
+cd two
+mkdir config
+$ACLOCAL
+$AUTOMAKE --add-missing
+grep TEST [ab]Makefile.in # For debugging.
+has_parallel_tests aMakefile.in
+hasnt_parallel_tests bMakefile.in
+mv aMakefile.in aMakefile.sav
+mv bMakefile.in bMakefile.sav
+test ! -r test-driver
+test -f config/test-driver
+$AUTOMAKE
+diff aMakefile.sav aMakefile.in
+diff bMakefile.sav bMakefile.in
+cd ..
+
+:
diff --git a/tests/tap-doc2.test b/tests/tap-doc2.test
index 7600e22..4946a2c 100755
--- a/tests/tap-doc2.test
+++ b/tests/tap-doc2.test
@@ -23,7 +23,8 @@ am_parallel_tests=yes
 . ./defs || Exit 1
 
 cat > Makefile.am <<'END'
-TEST_LOG_DRIVER = $(PERL) $(srcdir)/build-aux/tap-driver.pl
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                  $(top_srcdir)/build-aux/tap-driver.sh
 TESTS = foo.test bar.test baz.test
 EXTRA_DIST = $(TESTS)
 END
@@ -33,10 +34,8 @@ AC_INIT([GNU Try Tap], [1.0], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign parallel-tests -Wall -Werror])
 AC_CONFIG_FILES([Makefile])
-AC_REQUIRE_AUX_FILE([tap-driver.pl])
-AC_PATH_PROG([PERL], [perl])
-test -n "$PERL" || AC_MSG_ERROR([perl not found])
-$PERL -MTAP::Parser -e 1 || AC_MSG_ERROR([TAP::Parser not found])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AC_PROG_AWK
 AC_OUTPUT
 END
 
@@ -72,7 +71,7 @@ chmod a+x *.test
 # Strip extra "informative" lines that could be printed by Solaris
 # Distributed Make.
 mkdir build-aux
-cp "$am_scriptdir"/tap-driver.pl build-aux \
+cp "$am_scriptdir"/tap-driver.sh build-aux \
   || framework_failure_ "fetching the perl TAP driver"
 
 (export AUTOMAKE ACLOCAL AUTOCONF && $AUTORECONF -vi) || Exit 1


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]