Hash :
db973eaa
Author :
Date :
2012-02-21T19:47:36
tests: prefer 'configure.ac' over 'configure.in' With this change, our testsuite now uses 'configure.ac' as the name for the typical autoconf input, instead of the obsolescent 'configure.in' (which has been deprecated for several years, at least since autoconf 2.50). Most of the test cases changed by this commit have been automatically modified with this sed command (using GNU sed): sed -i 's/\<configure\(\\\?\)\.in\>/configure\1.ac/g' * syntax-checks.mk (sc_tests_no_configure_in): New syntax check. (syntax_check_rules): Add it. * tests/defs: Create stub for autoconf input in 'configure.ac', not in 'configure.in'. Adjust comments. ($AUTOCONF, $AUTOHEADER, $AUTORECONF): Remove workaround for the infamous debian autoconf wrapper: we don't need such workaround anymore now that we name our autoconf input as 'configure.ac'. For more information, see commit v1.11-564-g63da492 "test defs: hack to support autoconf-wrapper programs" of 16-12-2011. * tests/README: Use 'configure.ac', not 'configure.in'. * Many many tests: Likewise. * tests/backcompat3.test: Adjust to avoid spurious failures. * tests/backcompat5.test: Likewise. * tests/missing6.test: Likewise. * tests/backcompat6.test: Likewise, and extend a bit since we are at it.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
#! /bin/sh
# Copyright (C) 2008-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/>.
# Test AM_COND_IF.
. ./defs || Exit 1
cat >>configure.ac <<'END'
AC_DEFUN([FOO],
[AC_CONFIG_FILES([$1])])
AM_CONDITIONAL([COND], [test "$cond" = yes])
# Next lines should not cause a shell syntax error.
AM_COND_IF([COND])
AM_COND_IF([COND],
[AC_SUBST([BAR])])
AM_COND_IF([COND],
[AC_CONFIG_FILES([file1])])
# Things should work even at a time when the shell expressions
# for the conditional are not valid any more.
ok=$cond1
AM_CONDITIONAL([COND1], [test "$ok" = yes])
ok=$cond2
AM_CONDITIONAL([COND2], [test "$ok" = yes])
ok=$cond3
AM_CONDITIONAL([COND3], [test "$ok" = yes])
AM_COND_IF([COND1],
[AM_COND_IF([COND2], [FOO([file2])],
[AM_COND_IF([COND3],
[FOO([file3])])])])
AC_OUTPUT
END
: >Makefile.am
: >file1.in
: >file2.in
: >file3.in
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure cond=yes cond1=yes cond2=no cond3=yes
test -f file1
test ! -f file2
test -f file3
rm -f file1 file3
$MAKE file1 file3
$MAKE file2 && Exit 1
test -f file1
test ! -f file2
test -f file3
$MAKE distclean
./configure cond=no cond1=yes cond2=yes
test ! -f file1
test -f file2
test ! -f file3
rm -f file2
$MAKE file1 && Exit 1
$MAKE file2
$MAKE file3 && Exit 1
test ! -f file1
test -f file2
test ! -f file3
: