diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-15 16:12:09 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-18 14:03:11 +0200 |
| commit | 7b142a7b363a49be43ff861abc2dca5af9593f9d (patch) | |
| tree | e744359ac6bccf1714314ffd1d548bd858960739 /syntax-checks.mk | |
| parent | 8084ae1b520862e03201d3bddfe01f3c8d197d1c (diff) | |
| download | automake-7b142a7b363a49be43ff861abc2dca5af9593f9d.tar.gz | |
tests: use 'parallel-tests' Automake option by default
This will help our transition from 'serial-tests' to 'parallel-tests'
as the default test suite driver enabled by a TESTS assignment in the
input Makefile.am. Note that that change of default will only take
place in master, though.
* defs: Pass the 'parallel-tests' option to the AM_INIT_AUTOMAKE
invocation in the created 'configure.ac' stub, unless the variable
'am_serial_tests' is set to "yes". Don't pay attention anymore to
the 'am_parallel_tests' variable, that's obsolete now.
* defs-static.in: Warn if the 'am_serial_tests' variable is set in the
environment; conversely, don't warn anymore about 'am_parallel_tests'
being set in the environment.
* Makefile.am (AM_TESTS_ENVIRONMENT): Nullify the 'am_serial_tests'
variable instead of the now-obsolete 'am_parallel_tests' one.
* syntax-checks.mk (sc_tests_obsolete_variables): Also warn against
uses of 'am_parallel_tests', which is now deprecated in favor of
'am_serial_tests'. Similarly, if a use of 'parallel_tests' is seen,
suggest using 'am_serial_tests' instead, not 'am_parallel_tests'.
* gen-testsuite-part: Now that we use the 'parallel-tests' by default
in our tests, we need to completely change the logic and semantics of
generation of sibling tests for those tests that check the Automake
generated testsuite harness itself. Do that, and give a complete
explanation of the new logic and semantics in the relevant comments.
* t/README: Update.
* Lots of test cases: Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'syntax-checks.mk')
| -rw-r--r-- | syntax-checks.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/syntax-checks.mk b/syntax-checks.mk index bac6c7bba..402e17f18 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -277,10 +277,11 @@ sc_tests_make_without_am_makeflags: sc_tests_obsolete_variables: @vars=" \ using_tap \ - parallel_tests \ test_prefer_config_shell \ original_AUTOMAKE \ original_ACLOCAL \ + parallel_tests \ + am_parallel_tests \ "; \ seen=""; \ for v in $$vars; do \ @@ -290,7 +291,11 @@ sc_tests_obsolete_variables: done; \ if test -n "$$seen"; then \ for v in $$seen; do \ - echo "Variable '$$v' is obsolete, use 'am_$$v' instead." 1>&2; \ + case $$v in \ + parallel_tests|am_parallel_tests) v2=am_serial_tests;; \ + *) v2=am_$$v;; \ + esac; \ + echo "Variable '$$v' is obsolete, use '$$v2' instead." 1>&2; \ done; \ exit 1; \ else :; fi |