tests: avoid re-running a test with the 'parallel-tests' option

* tests/backcompat5.test (parallel_tests): Define to "no", to
prevent the generation of a sibling test script that uses the
'parallel-tests' driver.  That would be useless anyway, since
we manually override the contents of configure.in, thus clobbering
the `parallel-tests' option in AM_INIT_AUTOMAKE.
Fix a typo in comments since we are at it.

diff --git a/ChangeLog b/ChangeLog
index 0e837a255ce9c205ea34aae0c2d89adc0e0f4162..a48d4d2aa43f63fab2afffbcbf0de579a10c38da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: avoid re-running a test with the 'parallel-tests' option
+       * tests/backcompat5.test (parallel_tests): Define to "no", to
+       prevent the generation of a sibling test script that uses the
+       'parallel-tests' driver.  That would be useless anyway, since
+       we manually override the contents of configure.in, thus clobbering
+       the `parallel-tests' option in AM_INIT_AUTOMAKE.
+       Fix a typo in comments since we are at it.
+
 2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: defaults to awk+shell driver in tests on TAP support

diff --git a/tests/Makefile.in b/tests/Makefile.in
index feb3d50017b9c45c0745c65d17ac6c93d00bff33..aec6d776f1b34496022b6b2845c2fa2b2c26d0a3 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -290,7 +290,7 @@ XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
        override-conditional-2.test pr8365-remake-timing.test \
        yacc-dist-nobuild-subdir.test txinfo5.test \
        $(instspc_xfail_tests)
-parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \
+parallel_tests = check-concurrency-bug9245-p.test \
        check-exported-srcdir-p.test check-fd-redirect-p.test \
        check-tests-in-builddir-p.test check-p.test check11-p.test \
        check12-p.test check2-p.test check3-p.test check4-p.test \
@@ -1865,7 +1865,6 @@ uninstall-am:
        mostlyclean-generic pdf pdf-am ps ps-am recheck recheck-html \
        uninstall uninstall-am
 
-backcompat5-p.log: backcompat5.test
 check-concurrency-bug9245-p.log: check-concurrency-bug9245.test
 check-exported-srcdir-p.log: check-exported-srcdir.test
 check-fd-redirect-p.log: check-fd-redirect.test

diff --git a/tests/backcompat5.test b/tests/backcompat5.test
index 2385ae483c4481c98faf7a98821ebdb49fcfac84..45cb43aa0294d9545c9cfd456ccc54cc926e5b3f 100755 (executable)
--- a/tests/backcompat5.test
+++ b/tests/backcompat5.test
@@ -16,9 +16,10 @@
 
 # Backward-compatibility test: try to build and distribute a package
 # using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
-# This script can also serve as mild stress-testing for Automke.
+# This script can also serve as mild stress-testing for Automake.
 # See also the similar test `backcompat6.test'.
 
+parallel_tests=no
 . ./defs || Exit 1
 
 # Yuck!