diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 13:12:25 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 21:29:30 +0200 |
commit | 8a5096d150cf9803b8963768b7366cd68edcce03 (patch) | |
tree | a49c0e54876b8b9877d7ca2df386377e7b6037d1 /t/subst-no-trailing-empty-line.sh | |
parent | f8e822bbc197f01fc722aa6def7cddb4182e3c66 (diff) | |
download | automake-8a5096d150cf9803b8963768b7366cd68edcce03.tar.gz |
tests: rename 'tests/' => 't/', '*.test' => '*.sh'
When we (soon) convert the Automake testsuite to a non-recursive
make setup, we'll have to fix the entries of $(TESTS) to be
prepended with the subdirectory they are in; this will increase
the length of $(TESTS), and thus increase the possibility of
exceeding the command-line length limits on some systems (most
notably, MinGW/MSYS). See automake bug#7868 for more information.
Thus we rename the 'tests/' subdirectory to 't/', and each 'x.test'
script in there to 'x.sh'; this way, the $(TESTS) entry 'foo.test'
will become 't/foo.sh', which have the same number of characters.
* tests/: Rename ...
* t/: ... to this.
* t/*.test: Rename ...
* t/*.sh: ... to this.
* t/.gitignore: Removed as obsolete.
* t/defs: Adjust.
* t/gen-testsuite-part: Likewise.
* t/list-of-tests.mk: Likewise.
* t/ccnoco.sh: Likewise.
* t/ccnoco3.sh: Likewise.
* t/self-check-cleanup.tap: Likewise.
* t/self-check-dir.tap: Likewise.
* t/self-check-me.tap: Likewise.
* t/self-check-reexec.tap: Likewise.
* README: Likewise.
* bootstrap: Likewise
* configure.ac: Likewise.
* Makefile.am: Likewise.
* .gitignore: Likewise.
* syntax-check.mk: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subst-no-trailing-empty-line.sh')
-rwxr-xr-x | t/subst-no-trailing-empty-line.sh | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/t/subst-no-trailing-empty-line.sh b/t/subst-no-trailing-empty-line.sh new file mode 100755 index 000000000..2069e3a1c --- /dev/null +++ b/t/subst-no-trailing-empty-line.sh @@ -0,0 +1,97 @@ +#! /bin/sh +# Copyright (C) 2003-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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# If the last line of a automake-rewritten definition is made only of +# @substitutions@, automake should take care of appending an empty +# variable to make sure that line cannot end up substituted as a blank +# line (that would confuse HP-UX Make). +# These checks have been introduced in commit 'Release-1-9-254-g9d0eaef' +# into the former test 'subst2.test'. + +. ./defs || Exit 1 + +# These are deliberately quite long, so that the xxx_PROGRAMS definition +# in Makefile.am below will be split on multiple lines, with the last +# line containing only @substituted@ stuff that expands to empty (this is +# required to expose the bug we are testing). +v1=ABCDEFGHIJKLMNOPQRSTUVWX +v2=ABCDEFGHIJKLMNOPQRSTUVWXY +v3=ABCDEFGHIJKLMNOPQRSTUVWXYZ + +# Literal backslash for use by grep. +bs='\\' + +cat >> configure.ac <<END +AC_SUBST([A], ['']) +AC_SUBST([$v1], ['']) +AC_SUBST([$v2], ['']) +AC_SUBST([$v3], ['']) +AC_OUTPUT +END + +cat >Makefile.am <<END +AUTOMAKE_OPTIONS = no-dependencies +CC = false +EXEEXT = + +## The "x" and "zardoz" strings and the use of '+=' are there to ensure +## that these variables get rewritten by Automake. +noinst_PROGRAMS = x @$v1@ @$v2@ @$v3@ +bin_PROGRAMS = @A@ +bin_PROGRAMS += @$v1@ @$v2@ @$v3@ +check_PROGRAMS = zardoz \$(noinst_PROGRAMS) + +## Required whenever there are @substituted@ values in the +## PROGRAMS primary, otherwise automake will complain. +EXTRA_PROGRAMS = + +print-programs: + @echo BEG1: \$(noinst_PROGRAMS) :END1 + @echo BEG2: \$(bin_PROGRAMS) :END2 + @echo BEG3: \$(check_PROGRAMS) :END3 +END + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +# For debugging. +$EGREP -n 'ABCD|am__empty' Makefile.in +# Sanity check. +test `$EGREP -c "^[ $tab]*@$v2@ @$v3@[ $tab]*$bs?$" Makefile.in` -eq 3 + +./configure +{ + sed -n '/^noinst_PROGRAMS *=/,/[^\\]$/p' Makefile + sed -n '/^bin_PROGRAMS *=/,/[^\\]$/p' Makefile + sed -n '/^check_PROGRAMS *=/,/[^\\]$/p' Makefile + sed -n '/^am__EXEEXT.*=/,/[^\\]$/p' Makefile +} >t-programs +cat t-programs +grep '^ *$' t-programs && Exit 1 + +$MAKE print-programs >stdout || { cat stdout; Exit 1; } +cat stdout +grep '^BEG1: x :END1$' stdout +grep '^BEG2: :END2$' stdout +grep '^BEG3: zardoz x :END3$' stdout + +am__empty=X $MAKE -e print-programs >stdout || { cat stdout; Exit 1; } +cat stdout +grep '^BEG1: x X :END1$' stdout +grep '^BEG2: X :END2$' stdout +grep '^BEG3: zardoz x X :END3$' stdout + +: |