diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-05 13:41:13 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-06 10:29:20 +0100 |
| commit | 254227b6d5167a76f7ad96fa8a5657d81a7025c1 (patch) | |
| tree | 8fe22a461e351eff14f399fcd4c488b7c963620c /lib/am/check2.am | |
| parent | d1fbc759bfa42e5e0fe5c283dfcf9b642e815393 (diff) | |
| download | automake-254227b6d5167a76f7ad96fa8a5657d81a7025c1.tar.gz | |
parallel-tests: avoid trailing backslashes in make recipes
The new testsuite-harness could generate recipes with a trailing
backslash character (possibly followed by blank characters only),
in the very common case where the user hadn't defined the special
$(AM_TESTS_FD_REDIRECT) variable. This caused spurious syntax
errors with at least older bash versions (e.g., bash 2.05b), and
could be potentially unportable to other weaker shells.
See automake bug#10436:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10436>
and coreutils bug#10427:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10427#8>
* lib/am/check2.am: Rework line breaks so that no backslash can
be at the end of a line.
* tests/parallel-tests-trailing-bslash.test: New test.
* tests/list-of-tests.mk: Add it.
Report and diagnosis by Paul Eggert.
Diffstat (limited to 'lib/am/check2.am')
| -rw-r--r-- | lib/am/check2.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/am/check2.am b/lib/am/check2.am index ad0a4aa36..9a0fe9daa 100644 --- a/lib/am/check2.am +++ b/lib/am/check2.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc. +## Copyright (C) 2008, 2009, 2011, 2012 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -19,8 +19,8 @@ ?!GENERIC?%OBJ%: %SOURCE% @p='%SOURCE%'; $(am__check_pre) %DRIVER% --test-name "$$f" \ --log-file '%BASE%.log' --trs-file '%BASE%.trs' \ - $(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% "$$tst" \ - $(AM_TESTS_FD_REDIRECT) + $(am__common_driver_flags) %DRIVER_FLAGS% -- %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 @@ -30,6 +30,6 @@ if %am__EXEEXT% ?GENERIC?%EXT%$(EXEEXT).log: @p='%SOURCE%'; $(am__check_pre) %DRIVER% --test-name "$$f" \ --log-file '%BASE%.log' --trs-file '%BASE%.trs' \ - $(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% "$$tst" \ - $(AM_TESTS_FD_REDIRECT) + $(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% \ + "$$tst" $(AM_TESTS_FD_REDIRECT) endif %am__EXEEXT% |