diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-08 12:49:36 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-08 12:49:36 +0200 |
| commit | 12405c9fccb92791116c0391cbd7669ea00e9a04 (patch) | |
| tree | e7cee329d35fc7a559c6615a5b51a4d26888a7a4 /Makefile.am | |
| parent | adb834ebf078a00ed67ebc325c692452e6e5dcf6 (diff) | |
| parent | 33c59ec5252efb1021b2e52a8cad40918670362b (diff) | |
| download | automake-12405c9fccb92791116c0391cbd7669ea00e9a04.tar.gz | |
Merge branch 'maint'
* maint:
tests: fix a spurious failure with dash
test defs: fix indentation (cosmetic change)
tests: remove obsolete uses of $sh_errexit_works
configure: search a sturdy POSIX shell to be used in the testsuite
tests: shell running test scripts is now named AM_TEST_RUNNER_SHELL
fixup: distribute t/README
init: warn against obsolete usage of AM_INIT_AUTOMAKE
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 060cd4b96..a6129c32d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,8 +309,8 @@ EXTRA_DIST += m4/amversion.in ## Testsuite. ## ## ------------ ## -# Run the tests with the shell detected at configure time. -LOG_COMPILER = $(SHELL) +# Run the tests with a proper shell detected at configure time. +LOG_COMPILER = $(AM_TEST_RUNNER_SHELL) TEST_EXTENSIONS = .pl .sh .tap SH_LOG_COMPILER = $(LOG_COMPILER) @@ -322,7 +322,7 @@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh AM_TAP_LOG_DRIVER_FLAGS = --merge -EXTRA_DIST += t/ax/is +EXTRA_DIST += t/README t/ax/is TESTS = ## Will be updated later. |