summaryrefslogtreecommitdiff
path: root/tests/tap-doc2.test
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-19 10:21:01 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-08-19 10:21:01 +0200
commit82796c70d0a67f9af403fd010add959861c0ba40 (patch)
tree7d29fcd8ded34be2462998d3746c3e2cb2648021 /tests/tap-doc2.test
parentfa03ed7900f304fca5eb5e277a4f70b01dbd73b7 (diff)
parent271343d8ef023b9891d9b06bce5e62268f8b50e5 (diff)
downloadautomake-82796c70d0a67f9af403fd010add959861c0ba40.tar.gz
Merge branch 'test-protocols' into testsuite-work
* test-protocols: testsuite: fix some redundant autotools calls in tests on TAP * THANKS (Daniel Richard G.): Update e-mail address. java: avoid compilation errors when CLASSPATH is empty parallel-tests: no more spurious successes for FreeBSD make tap: improve granularity for tests on problematic TAP messages tap: correctly handle string "0" in TAP messages tap: a minor simplification in the perl TAP driver parallel-tests: fix help screen for test driver scripts tap: add a dummy TAP driver script implemented in shell + awk testsuite: refactor tests on TAP support in view of future changes fix: regenerate tests/Makefile.in hacking: we now require autoconf 2.68
Diffstat (limited to 'tests/tap-doc2.test')
-rwxr-xr-xtests/tap-doc2.test7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/tap-doc2.test b/tests/tap-doc2.test
index 45d09ca55..468bb1cc2 100755
--- a/tests/tap-doc2.test
+++ b/tests/tap-doc2.test
@@ -23,7 +23,7 @@ parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am <<'END'
-TEST_LOG_DRIVER = $(PERL) $(srcdir)/build-aux/tap-driver
+TEST_LOG_DRIVER = $(PERL) $(srcdir)/build-aux/tap-driver.pl
TESTS = foo.test bar.test baz.test
EXTRA_DIST = $(TESTS)
END
@@ -33,7 +33,7 @@ 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])
+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])
@@ -70,7 +70,8 @@ END
chmod a+x *.test
mkdir build-aux
-cp "$top_testsrcdir"/lib/tap-driver build-aux
+cp "$top_testsrcdir"/lib/tap-driver.pl build-aux \
+ || framework_failure_ "fetching the perl TAP driver"
(export AUTOMAKE ACLOCAL AUTOCONF && $AUTORECONF -vi) || Exit 1