summaryrefslogtreecommitdiff
path: root/t/tap-deps.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-05-18 15:03:49 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-05-18 15:16:17 +0200
commitfee394d4df485724bda65e052fcbf03ba41c8dd8 (patch)
treef61e3371195d87bd23d85dc5219b718e82b3828e /t/tap-deps.sh
parent4afce93badb93dd22be31d3f373962ad0af43fbc (diff)
parent7b6129b9bb74773e1a02c5c43614f9fd47179369 (diff)
downloadautomake-fee394d4df485724bda65e052fcbf03ba41c8dd8.tar.gz
Merge branch 'master' into ng/master
* master: tests: use 'parallel-tests' Automake option by default doc: fix location of Automake's own test-suite.log file yacc tests: avoid a spurious failure with Sun C++ 5.9 self tests: cater for /bin/ksh symlinked to Zsh tests: fix spurious failures due to dpkg install-info + Non-trivial extra edits: * t/check7.sh: look at the contents of '$am_serial_tests', not of '$am_parallel_tests', to decide which kind of testsuite harness is being used. * t/parallel-tests-concatenated-suffix.sh: Don't explicitly set '$am_parallel_tests' to "yes" anymore, is not required and would cause a 'maintainer-check' failure. * t/parallel-tests-dynamic.sh: Likewise. * t/parallel-tests-longest-stem.sh: Likewise. * t/parallel-tests-no-repeat.sh: Likewise. * t/parallel-tests-per-suffix-deps.sh: Likewise. * t/parallel-tests-srcdir-in-test-name.sh: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/tap-deps.sh')
-rwxr-xr-xt/tap-deps.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 9295257e4..9e52b79bc 100755
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -17,7 +17,6 @@
# Basic TAP test protocol support:
# - dependencies between test scripts
-am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'