From: Stefano Lattarini Date: Mon, 29 Aug 2011 13:16:21 +0000 (+0200) Subject: tests: avoid re-running a test with the 'parallel-tests' option X-Git-Tag: ng-0.5a~89^2~92^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dab3a457990b054cb738fe2bb5b2fa12d0b3912;p=thirdparty%2Fautomake.git 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 0e837a255..a48d4d2aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-08-29 Stefano Lattarini + + 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 tests: defaults to awk+shell driver in tests on TAP support diff --git a/tests/Makefile.in b/tests/Makefile.in index feb3d5001..aec6d776f 100644 --- 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 2385ae483..45cb43aa0 100755 --- 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!