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 84 85 86 87 88 89 90 91 92 93
#! /bin/sh
# Copyright (C) 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
# 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/>.
# Check that auxiliary script 'test-driver' gets automatically installed
# in the correct directory by 'parallel-tests' option.
am_parallel_tests=yes
. ./defs || Exit 1
: Try first with parallel-tests defined in AM_INIT_AUTOMAKE.
mkdir am-init-automake
cd am-init-automake
cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([my_aux_dir])
AM_INIT_AUTOMAKE([parallel-tests])
AC_CONFIG_FILES([Makefile sub/Makefile])
AC_OUTPUT
END
mkdir sub my_aux_dir
cat > Makefile.am <<END
SUBDIRS = sub
TESTS = foo.test
END
cat > sub/Makefile.am <<END
TESTS = bar.test
END
$ACLOCAL
$AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
cat stderr >&2
ls -l . sub my_aux_dir # For debugging.
test -f my_aux_dir/test-driver
test ! -r test-driver
test ! -r sub/test-driver
grep '^configure\.ac:3:.*installing.*my_aux_dir/test-driver' stderr
cd ..
: Now try with parallel-tests defined in AUTOMAKE_OPTIONS.
mkdir automake-options
cd automake-options
cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([dir/GNUmakefile])
AC_OUTPUT
END
mkdir build-aux dir
cat > dir/GNUmakefile.am <<END
TESTS = foo.test
AUTOMAKE_OPTIONS = parallel-tests
TESTS += bar.test
END
$ACLOCAL
$AUTOMAKE --add-missing --copy dir/GNUmakefile 2>stderr \
|| { cat stderr >&2; Exit 1; }
cat stderr >&2
ls -l . dir build-aux # For debugging.
test -f build-aux/test-driver
test ! -r test-driver
test ! -r dir/test-driver
grep '^dir/GNUmakefile\.am:2:.*installing.*build-aux/test-driver' stderr
: