summaryrefslogtreecommitdiff
path: root/lib/am/check2.am
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-07-24 16:47:24 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-08-02 23:01:25 +0200
commitb9e9d546e8ab45139be6d8e939602cd712c36c8c (patch)
tree8062de2afc656bde7f2b3b791a38dc995fb8c94f /lib/am/check2.am
parent3af7ec13fa085bbb532384d6bb7fd01fbd62391d (diff)
downloadautomake-b9e9d546e8ab45139be6d8e939602cd712c36c8c.tar.gz
simple tests: support developer-defined fd redirections
Motivated by coreutils bug#8846, and related discussions: <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846> <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html> In those threads it has been shown how problematic it can be to do portable file descriptor redirections in the testsuite when using the Automake testsuite harness. This change should remedy to that situation. * lib/am/check2.am (?GENERIC?%EXT%$(EXEEXT).log, ?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Append redirection defined in $(AM_TESTS_FD_REDIRECT) to the command-line invocations of the test scripts. * lib/am/check.am [!%?PARALLEL_TESTS%] $(check-TESTS): Likewise. * NEWS: Update. * doc/automake.texi (Script-based Testsuites): Document the new feature. * tests/check-fd-redirect.test: New test. * tests/parallel-tests-fd-redirect.test: Likewise. * tests/parallel-tests-am_tests_environment.test: Remove checks about the use of redirections in AM_TESTS_ENVIRONMENT: they would check deprecated (if not undefined) behaviour now. Strengthen a couple of still valid checks, to keep the test more in sync with the documentation. Improve debugging information. * tests/Makefile.am (TESTS): Update.
Diffstat (limited to 'lib/am/check2.am')
-rw-r--r--lib/am/check2.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/am/check2.am b/lib/am/check2.am
index b7ed0eeaa..f4fb3c918 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -19,7 +19,7 @@
?!GENERIC?%OBJ%: %SOURCE%
@p='%SOURCE%'; $(am__check_pre) \
%DRIVER% $(am__test_driver_flags) %DRIVER_FLAGS% -- \
- %COMPILE% "$$tst"
+ %COMPILE% "$$tst" $(AM_TESTS_FD_REDIRECT)
## If no programs are built in this package, then this rule is removed
## at automake time. Otherwise, %am__EXEEXT% expands to a configure time
@@ -29,5 +29,5 @@ if %am__EXEEXT%
?GENERIC?%EXT%$(EXEEXT).log:
@p='%SOURCE%'; $(am__check_pre) \
%DRIVER% $(am__test_driver_flags) %DRIVER_FLAGS% -- \
- %COMPILE% "$$tst"
+ %COMPILE% "$$tst" $(AM_TESTS_FD_REDIRECT)
endif %am__EXEEXT%