diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-18 14:31:36 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-18 14:31:36 +0200 |
| commit | 7b6129b9bb74773e1a02c5c43614f9fd47179369 (patch) | |
| tree | 143a5d3e0c70fc6efe0215836ea929713d0f70c1 /Makefile.am | |
| parent | e251673828b140ebfcabfc520bfe8c20e0f06e4f (diff) | |
| parent | 7b142a7b363a49be43ff861abc2dca5af9593f9d (diff) | |
| download | automake-7b6129b9bb74773e1a02c5c43614f9fd47179369.tar.gz | |
Merge branch 'maint'
* maint:
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
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a6129c32d..b2c4e6bc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -333,7 +333,7 @@ AM_TESTS_ENVIRONMENT = \ me \ required \ am_using_tap \ - am_parallel_tests \ + am_serial_tests \ am_test_prefer_config_shell \ am_original_AUTOMAKE \ am_original_ACLOCAL \ |