diff options
Diffstat (limited to 't')
124 files changed, 216 insertions, 2244 deletions
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap index be7e34976..203967456 100755 --- a/t/ac-output-old.tap +++ b/t/ac-output-old.tap @@ -24,8 +24,6 @@ plan_ 22 rm -f configure.ac depcomp # Not required. -AUTOMAKE="$AUTOMAKE -Wno-obsolete" - # ----------------------------------------------------------------------- # Test for bug reported by François Pinard. @@ -54,18 +52,15 @@ acoutbs_check () } acoutbs_check 1 << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutbs1], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT(Makefile \ zot) END acoutbs_check 2 << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) -AC_ARG_PROGRAM -AC_PROG_INSTALL -AC_PROG_MAKE_SET +AC_INIT([acoutbs2], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT(\ Makefile \ zot @@ -85,8 +80,8 @@ mkdir acoutnoq cd acoutnoq cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutnoq], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT(Makefile, [true]) END @@ -107,8 +102,8 @@ mkdir acoutpt cd acoutpt cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutpt], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT([Makefile], [true]) END @@ -163,8 +158,8 @@ mkdir acoutqnl cd acoutqnl cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutqnl], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT([Makefile], [echo zardoz has spoken]) END diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh index abd7857d1..ac5de4cac 100755 --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@ -14,9 +14,9 @@ # 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 aclocal's '--acdir', '--automake-acdir' and '--system-acdir' -# options. Also check that stuff in the automake acdir takes precedence -# over stuff in the system acdir. +# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also +# check that stuff in the automake acdir takes precedence over stuff in +# the system acdir. . ./defs || exit 1 @@ -72,24 +72,4 @@ $FGREP 'fake--init--automake' configure $FGREP 'am--macro' configure $FGREP 'my--macro' configure && exit 1 # Just to be sure. -rm -rf autom4te*.cache - -# Obsolescent '--acdir' option. -$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep '.*--acdir.*deprecated' stderr - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir am -$AUTOCONF --force -$FGREP 'fake--init--automake' configure -$FGREP 'am--macro' configure - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr - : diff --git a/t/missing6.sh b/t/aclocal-autoconf-version-check.sh index 8e02ae999..8e02ae999 100755 --- a/t/missing6.sh +++ b/t/aclocal-autoconf-version-check.sh diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh index 81eee9886..220533ef4 100755 --- a/t/aclocal-path-precedence.sh +++ b/t/aclocal-path-precedence.sh @@ -21,7 +21,7 @@ am_create_testdir=empty cat > configure.ac << 'END' AC_INIT([foo], [1.0]) -AM_INIT_AUTOMAKE([parallel-tests]) +AM_INIT_AUTOMAKE FOO_MACRO BAR_MACRO AC_PROG_LIBTOOL diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh index d057d826e..c5a8eb5ea 100755 --- a/t/aclocal-print-acdir.sh +++ b/t/aclocal-print-acdir.sh @@ -22,9 +22,6 @@ am_create_testdir=empty $ACLOCAL --print-ac-dir test "$($ACLOCAL --print-ac-dir)" = "$am_system_acdir" -$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir -test "$($ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir)" = foo - $ACLOCAL --system-acdir /bar --print-ac-dir test "$($ACLOCAL --system-acdir /bar --print-ac-dir)" = /bar diff --git a/t/acsilent.sh b/t/acsilent.sh index 18f18ff92..92c43002a 100755 --- a/t/acsilent.sh +++ b/t/acsilent.sh @@ -19,14 +19,13 @@ . ./defs || exit 1 cat >configure.ac <<EOF -AC_INIT +AC_INIT([$me], [1.0]) AM_INIT_GUILE_MODULE EOF cat > acinclude.m4 << 'END' -AC_DEFUN([AM_INIT_GUILE_MODULE],[ -. $srcdir/../GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AC_DEFUN([AM_INIT_GUILE_MODULE], [ +AM_INIT_AUTOMAKE([dist-xz]) AC_CONFIG_AUX_DIR(..) module=[$1] AC_SUBST(module)]) diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh index 6368db5ba..e16529dba 100755 --- a/t/am-missing-prog.sh +++ b/t/am-missing-prog.sh @@ -51,13 +51,11 @@ o = $@-stdout e = $@-stderr debug_info = grep . $@-stdout $@-stderr -status_is = $(debug_info); echo $@: st=$$st; : test $$st -eq +status_is = $(debug_info); echo $@: st=$$st; test $$st -eq w_mis = 'am-none-none' is needed, and is missing on your system w_old = 'am-exit-63' is needed, and is probably too old -# FIXME: make this test stricter w.r.t. the exit statuses once -# FIXME: we are merged to master! test1: st=0; $(NO_SUCH_COMMAND) >$o 2>$e || st=$$?; $(status_is) 127 grep "^WARNING: $(w_mis)" $e diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-no-more.sh index a8d4605e2..ce30c2995 100755 --- a/t/aminit-moreargs-deprecation.sh +++ b/t/aminit-moreargs-no-more.sh @@ -14,12 +14,16 @@ # 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 automake warns against old-style usages of AM_INIT_AUTOMAKE -# (i.e., calls with two or three arguments). +# Check that automake error out (with an helpful error message) against +# old-style usages of AM_INIT_AUTOMAKE (i.e., calls with two or three +# arguments). . ./defs || exit 1 -warn_rx='AM_INIT_AUTOMAKE.* two-.* three-arguments form.*deprecated' +warn_rx='AM_INIT_AUTOMAKE.* old-style two-.* three-arguments form.*unsupported' + +$ACLOCAL +mv aclocal.m4 aclocal.sav cat > configure.ac <<'END' AC_INIT([Makefile.am]) @@ -27,16 +31,14 @@ AM_INIT_AUTOMAKE([twoargs], [1.0]) AC_CONFIG_FILES([Makefile]) END -$ACLOCAL - do_check() { rm -rf autom4te*.cache - for cmd in "$AUTOCONF" "$AUTOMAKE"; do - $cmd -Werror -Wnone -Wobsolete 2>stderr && { cat stderr; exit 1; } + for cmd in "$ACLOCAL" "$AUTOCONF" "$AUTOMAKE"; do + cp aclocal.sav aclocal.m4 + $cmd -Wnone -Wno-error 2>stderr && { cat stderr; exit 1; } cat stderr >&2 grep "^configure\.ac:2:.*$warn_rx" stderr - $cmd -Werror -Wall -Wno-obsolete || exit 1 done } diff --git a/t/autohdr2.sh b/t/autohdr2.sh deleted file mode 100755 index 292a800bd..000000000 --- a/t/autohdr2.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002-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 autoheaders works, despite our AC_CONFIG_HEADERS hack. - -. ./defs || exit 1 - -cat >>configure.ac <<EOF -AM_CONFIG_HEADER([thisfile.h]) -EOF - -: > Makefile.am - -$ACLOCAL -$AUTOHEADER - -test -f thisfile.h.in diff --git a/t/ax/extract-testsuite-summary.pl b/t/ax/extract-testsuite-summary.pl index 28a9c3560..a8b634373 100644 --- a/t/ax/extract-testsuite-summary.pl +++ b/t/ax/extract-testsuite-summary.pl @@ -1,6 +1,6 @@ #! /usr/bin/env perl -# Extract the testsuite summary generated by the parallel-tests harness -# from the output of "make check". +# Extract the testsuite summary generated by the parallel testsuite +# harness from the output of "make check". # Copyright (C) 2012 Free Software Foundation, Inc. diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh index 156c4ad83..25fedfe48 100644 --- a/t/ax/tap-summary-aux.sh +++ b/t/ax/tap-summary-aux.sh @@ -29,7 +29,7 @@ fetch_tap_driver cat > configure.ac <<END AC_INIT([GNU AutoTAP], [5.12], [bug-automake@gnu.org]) -AM_INIT_AUTOMAKE([parallel-tests]) +AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile]) AC_OUTPUT END diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh index 24945b67d..d9f472996 100644 --- a/t/ax/test-init.sh +++ b/t/ax/test-init.sh @@ -797,13 +797,6 @@ do makedepend -f- \ || skip_all_ "required program 'makedepend' not available" ;; - makeinfo-html) - # Make sure we have makeinfo, and it understands '--html'. - echo "$me: running makeinfo --html --version" - makeinfo --html --version \ - || skip_all_ "cannot find a makeinfo program that groks" \ - "the '--html' option" - ;; mingw) uname_s=$(uname -s || echo UNKNOWN) echo "$me: system name: $uname_s" @@ -876,12 +869,6 @@ do skip_all_ "TeX is required, but it wasn't found by configure" fi ;; - texi2dvi-o) - # Texi2dvi supports '-o' since Texinfo 4.1. - echo "$me: running texi2dvi -o /dev/null --version" - texi2dvi -o /dev/null --version \ - || skip_all_ "required program 'texi2dvi' not available" - ;; lex) test x"$LEX" = x"false" && skip_all_ "lex not found or disabled" export LEX @@ -1041,9 +1028,9 @@ else { echo "AC_INIT([$me], [1.0])" if test x"$am_serial_tests" = x"yes"; then - echo "AM_INIT_AUTOMAKE" + echo "AM_INIT_AUTOMAKE([serial-tests])" else - echo "AM_INIT_AUTOMAKE([parallel-tests])" + echo "AM_INIT_AUTOMAKE" fi echo "AC_CONFIG_FILES([Makefile])" } >configure.ac || framework_failure_ "creating configure.ac skeleton" diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh index 54d76cd04..9137c22a4 100644 --- a/t/ax/testsuite-summary-checks.sh +++ b/t/ax/testsuite-summary-checks.sh @@ -14,7 +14,7 @@ # 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 the testsuite summary with the parallel-tests harness. This +# Check the testsuite summary with the parallel test harness. This # script is meant to be sourced by other test script, so that it can # be used to check different scenarios (colorized and non-colorized # testsuite output, packages with and without bug-report addresses, @@ -28,10 +28,10 @@ case $use_colors in # Forced colorization should take place also with non-ANSI # terminals; hence this setting. TERM=dumb; export TERM - am_opts='parallel-tests color-tests' + am_opts='color-tests' ;; no) - am_opts='parallel-tests' + am_opts='' ;; *) fatal_ "invalid use_colors='$use_colors'";; diff --git a/t/backcompat4.sh b/t/backcompat-acout.sh index f2e552bf5..f2e552bf5 100755 --- a/t/backcompat4.sh +++ b/t/backcompat-acout.sh diff --git a/t/backcompat.sh b/t/backcompat.sh deleted file mode 100755 index fa8368763..000000000 --- a/t/backcompat.sh +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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 usage of AM_INIT_AUTOMAKE with two or three arguments, for -# backward-compatibility. - -. ./defs || exit 1 - -cat > Makefile.am <<'END' -.PHONY: test display - -## Might be useful for debugging. -display: -## The following should be substituted by AM_INIT_AUTOMAKE. - @echo PACKAGE = $(PACKAGE) - @echo VERSION = $(VERSION) -## The following should not be substituted, as we used the -## old form of AC_INIT. - @echo PACKAGE_NAME = $(PACKAGE_NAME) - @echo PACKAGE_VERSION = $(PACKAGE_VERSION) - @echo PACKAGE_TARNAME = $(PACKAGE_TARNAME) - @echo PACKAGE_STRING = $(PACKAGE_STRING) - -test: display - test x'$(PACKAGE)' = x'FooBar' - test x'$(VERSION)' = x'0.7.1' - test x'$(PACKAGE_NAME)' = x - test x'$(PACKAGE_VERSION)' = x - test x'$(PACKAGE_TARNAME)' = x - test x'$(PACKAGE_STRING)' = x -END - -for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do - for am_extra_args in '' ', []' ', [:]' ', [false]'; do - rm -rf autom4te*.cache config* Makefile.in Makefile - unindent > configure.in <<END - $ac_init - AM_INIT_AUTOMAKE([FooBar], [0.7.1]$am_extra_args) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -END - cat configure.in # For debugging. - $ACLOCAL - $AUTOCONF - $AUTOMAKE -Wno-obsolete - ./configure - $MAKE test - done -done - -: diff --git a/t/backcompat2.sh b/t/backcompat2.sh deleted file mode 100755 index 84bf64235..000000000 --- a/t/backcompat2.sh +++ /dev/null @@ -1,73 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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/>. - -# Backward-compatibility test: check that AM_INIT_AUTOMAKE with two or -# three arguments does AC_DEFINE the symbols PACKAGE and VERSION iff the -# third argument is empty or non-existent. - -am_create_testdir=empty -. ./defs || exit 1 - -# A trick to make the test run muuuch faster, by avoiding repeated -# runs of aclocal (one order of magnitude improvement in speed!). -echo 'AC_INIT(x,0) AM_INIT_AUTOMAKE' > configure.in -$ACLOCAL -rm -rf configure.in autom4te.* - -touch install-sh missing - -cat > config.h.in <<'END' -#undef PACKAGE -#undef VERSION -END - -for am_arg3 in ':' 'false' '#' ' '; do - unindent > configure.in <<END - AC_INIT - AC_CONFIG_HEADERS([config.h]) - AM_INIT_AUTOMAKE([pkgname], [pkgversion], [$am_arg3]) - AC_OUTPUT -END - cat configure.in # For debugging. - $AUTOCONF - ./configure - cat config.h # For debugging. - # The non-empty third argument should prevent PACKAGE and VERSION - # from being AC_DEFINE'd. - $EGREP 'pkg(name|version)' config.h && exit 1 - # This is required because even relatively-recent versions of the - # BSD shell wrongly exit when the 'errexit' shell flag is active if - # the last command of a compound statement fails, even if it should - # be protected by the use of "&&". - : -done - -for am_extra_args in '' ',' ', []'; do - unindent > configure.in <<END - AC_INIT - AC_CONFIG_HEADERS([config.h]) - AM_INIT_AUTOMAKE([pkgname], [pkgversion]$am_extra_args) - AC_OUTPUT -END - cat configure.in # For debugging. - $AUTOCONF - ./configure - cat config.h # For debugging. - grep '^ *# *define *PACKAGE *"pkgname" *$' config.h - grep '^ *# *define *VERSION *"pkgversion" *$' config.h -done - -: diff --git a/t/backcompat3.sh b/t/backcompat3.sh deleted file mode 100755 index e00992bb2..000000000 --- a/t/backcompat3.sh +++ /dev/null @@ -1,154 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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/>. - -# Backward-compatibility test: check what happens when AC_INIT and -# AM_INIT_AUTOMAKE are both given two or more arguments. - -am_create_testdir=empty -. ./defs || exit 1 - -empty='' - -AUTOMAKE="$AUTOMAKE -Wno-obsolete" - -cat > Makefile.am <<'END' -## Leading ':;' here required to work around bugs of (at least) bash 3.2 -got: Makefile - @:; { \ - echo 'PACKAGE = $(PACKAGE)'; \ - echo 'VERSION = $(VERSION)'; \ - echo 'PACKAGE_NAME = $(PACKAGE_NAME)'; \ - echo 'PACKAGE_VERSION = $(PACKAGE_VERSION)'; \ - echo 'PACKAGE_STRING = $(PACKAGE_STRING)'; \ - echo 'PACKAGE_TARNAME = $(PACKAGE_TARNAME)'; \ - echo 'PACKAGE_BUGREPORT = $(PACKAGE_BUGREPORT)'; \ - echo 'PACKAGE_URL = $(PACKAGE_URL)'; \ - } >$@ -END - - -### Run 1 ### - -cat > configure.in <<END -AC_INIT([ac_name], [ac_version]) -AM_INIT_AUTOMAKE([am_name], [am_version]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -cat configure.in - -$ACLOCAL -$AUTOCONF -$AUTOMAKE -a - -./configure - -cat >exp <<END -PACKAGE = am_name -VERSION = am_version -PACKAGE_NAME = ac_name -PACKAGE_VERSION = ac_version -PACKAGE_STRING = ac_name ac_version -PACKAGE_TARNAME = ac_name -PACKAGE_BUGREPORT = $empty -PACKAGE_URL = $empty -END - -$MAKE got - -diff exp got - - -### Run 2 ### - -cat > configure.in <<'END' -dnl: 'AC_INIT' in Autoconf <= 2.63 doesn't have an URL argument. -dnl: Luckily, 'AC_AUTOCONF_VERSION' and 'm4_version_prereq' are -dnl: both present in autoconf 2.62, which we require; so that we -dnl: can at least use the following workaround. -m4_version_prereq([2.64], - [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname], - [ac_url])], - [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname]) - AC_SUBST([PACKAGE_URL], [ac_url])]) -AM_INIT_AUTOMAKE([am_name], [am_version]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -cat configure.in - -$ACLOCAL -$AUTOCONF -$AUTOMAKE - -./configure - -cat >exp <<END -PACKAGE = am_name -VERSION = am_version -PACKAGE_NAME = ac_name -PACKAGE_VERSION = ac_version -PACKAGE_STRING = ac_name ac_version -PACKAGE_TARNAME = ac_tarname -PACKAGE_BUGREPORT = ac_bugreport -PACKAGE_URL = ac_url -END - -$MAKE got - -diff exp got - - -### Run 3 ### - -cat > configure.in <<END -AC_INIT([ac_name], [ac_version]) -AM_INIT_AUTOMAKE([am_name], [am_version], [am_foo_quux]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -cat configure.in - -$ACLOCAL -$AUTOCONF -$AUTOMAKE - -./configure - -cat >exp <<END -PACKAGE = am_name -VERSION = am_version -PACKAGE_NAME = ac_name -PACKAGE_VERSION = ac_version -PACKAGE_STRING = ac_name ac_version -PACKAGE_TARNAME = ac_name -PACKAGE_BUGREPORT = $empty -PACKAGE_URL = $empty -END - -$MAKE got - -diff exp got - -$FGREP am_foo_quux Makefile.in Makefile configure config.status && exit 1 - - -### Done ### - -: diff --git a/t/backcompat5.sh b/t/backcompat5.sh deleted file mode 100755 index 88f4ce952..000000000 --- a/t/backcompat5.sh +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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/>. - -# Backward-compatibility test: try to build and distribute a package -# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT. -# This script can also serve as mild stress-testing for Automake. -# See also the similar test 'backcompat6.test'. - -am_serial_tests=yes -am_create_testdir=empty -. ./defs || exit 1 - -makefiles='hacky/Makefile src/Makefile data/Makefile tests/Makefile' - -# Yuck! -cat > configure.in <<END -dnl: Everything here is *deliberately* underquoted! -AC_INIT(src/foo.input) -AM_INIT_AUTOMAKE(foo, 1.0) -AC_CONFIG_FILES(Makefile:mkfile.in) -AC_OUTPUT($makefiles) -END - -distdir=foo-1.0 - -cat > mkfile.am <<'END' -SUBDIRS = src data tests hacky -installcheck-local: - grep DataDataData $(DESTDIR)$(prefix)/data/$(PACKAGE)-$(VERSION)/bar -END - -mkdir hacky src tests data - -echo 'This is a dummy package' > README - -cat > src/foo.input <<'END' -#!sh -echo Zardoz -END - -cat > tests/a.test <<'END' -#!/bin/sh -"$srcdir/../src/foo" | grep Zardoz -END -chmod a+x tests/a.test - -cat > data/bar <<'END' -line1 -line2 -line3 -END - -cat >hacky/Makefile.am <<'END' -dist-hook: - find $(top_distdir) -print - chmod a+rx $(top_distdir)/tests/*.test -END - -cat > src/Makefile.am <<'END' -dist_bin_SCRIPTS = foo -foo: foo.input - sed '1s,^#!.*$$,#!/bin/sh,' $(srcdir)/foo.input >$@ - chmod a+x $@ -EXTRA_DIST = foo.input -DISTCLEANFILES = foo -END - -cat > data/Makefile.am <<'END' -nodist_data_DATA = bar -datadir = $(prefix)/data/$(PACKAGE)-$(VERSION) -bar: - echo DataDataData >$@ -distclean-local: - rm -f bar -END - -cat > tests/Makefile.am <<'END' -TESTS = a.test -EXTRA_DIST = $(TESTS) -END - -$ACLOCAL -$AUTOCONF -$AUTOMAKE -a -Wno-obsolete -test -f install-sh -for f in $makefiles; do mv -f $f.in $f.sav; done -$AUTOMAKE -Wno-obsolete -for f in $makefiles; do diff $f.sav $f.in; done - -./configure -ls -l . hacky src data tests # For debugging. -test ! -f mkfile -$MAKE -$MAKE distdir -test ! -f $distdir/Makefile.in -test ! -f $distdir/data/bar -test -f $distdir/src/foo -diff README $distdir/README -diff mkfile.in $distdir/mkfile.in -diff tests/a.test $distdir/tests/a.test -diff src/foo.input $distdir/src/foo.input - -$MAKE check -$MAKE distcheck - -test -f $distdir.tar.gz - -chmod a-x tests/a.test -# dist-hook should take care of making test files executables. -$MAKE distcheck - -: diff --git a/t/backcompat6.sh b/t/backcompat6.sh deleted file mode 100755 index 271ffd3c8..000000000 --- a/t/backcompat6.sh +++ /dev/null @@ -1,104 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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/>. - -# Backward-compatibility test: try to build and distribute a package -# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT. -# This script can also serve as mild stress-testing for Automake. -# See also the similar test 'backcompat5.test'. - -required=cc -am_create_testdir=empty -. ./defs || exit 1 - -# Anyone doing something like this in a real-life package probably -# deserves to be killed. -cat > configure.in <<'END' -dnl: Everything here is *deliberately* underquoted! -AC_INIT(quux.c) -PACKAGE=nonesuch-zardoz -VERSION=nonesuch-0.1 -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AC_SUBST(one,1) -two=2 -AC_SUBST(two, $two) -three=3 -AC_SUBST(three) -AC_PROG_CC -AC_CONFIG_HEADERS(config.h:config.hin) -AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = yes) -AC_OUTPUT(Makefile foo.got:foo1.in:foo2.in:foo3.in) -END - -echo @one@ > foo1.in -echo @two@ > foo2.in -echo @three@ > foo3.in - -cat >config.hin <<'END' -#undef PACKAGE -#undef VERSION -END - -cat >> Makefile.am <<'END' -bin_PROGRAMS = foo -foo_SOURCES = quux.c -check-local: - test x'$(PACKAGE)' = x'nonesuch-zardoz' - test x'$(VERSION)' = x'nonesuch-0.1' -if ! CROSS_COMPILING - ./foo -## Do not anchor the regexps w.r.t. the end of line, because on -## MinGW/MSYS, grep may assume LF line endings only, while our -## 'foo' program may generate CRLF line endings. - ./foo | grep '^PACKAGE = nonesuch-zardoz!' - ./foo | echo '^VERSION = nonesuch-0\.1!' -endif -END - -cat > quux.c <<'END' -#include <config.h> -#include <stdio.h> -int main (void) -{ - printf("PACKAGE = %s!\nVERSION = %s!\n", PACKAGE, VERSION); - return 0; -} -END - -$ACLOCAL -$AUTOMAKE -Wno-obsolete --add-missing -$AUTOCONF - -./configure - -cat >foo.exp <<'END' -1 -2 -3 -END - -diff foo.exp foo.got - -$MAKE -$MAKE check - -distdir=nonesuch-zardoz-nonesuch-0.1 -$MAKE distdir -test -f $distdir/quux.c -test ! -f $distdir/foo.got - -$MAKE distcheck - -: diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh index baa8c4003..ff48a5f1c 100755 --- a/t/check-exported-srcdir.sh +++ b/t/check-exported-srcdir.sh @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that the testsuite driver (either with or without the -# parallel-tests option enabled) exports the 'srcdir' value in the +# serial-tests option enabled) exports the 'srcdir' value in the # environment of the tests. This is documented in the manual. # For gen-testsuite-part: ==> try-with-serial-tests <== diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh index 7df5251f8..bcb2cc927 100755 --- a/t/check-no-test-driver.sh +++ b/t/check-no-test-driver.sh @@ -15,13 +15,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that auxiliary script 'test-driver' doesn't get needlessly -# installed or referenced when the 'parallel-tests' option is not -# used. +# installed or referenced when the 'serial-tests' option is used. am_serial_tests=yes . ./defs || exit 1 -echo 'TESTS = foo.test' > Makefile.am +cat > Makefile.am <<'END' +AUTOMAKE_OPTIONS = serial-tests +TESTS = foo.test +END $ACLOCAL diff --git a/t/check-subst.sh b/t/check-subst.sh index fe623bbbf..b743ca335 100755 --- a/t/check-subst.sh +++ b/t/check-subst.sh @@ -16,7 +16,7 @@ # Check @substituted@ TESTS. # Note that in this test, we rely on the .test extension for the -# substituted names: this is necessary for parallel-tests. +# substituted names: this is necessary for the parallel harness. # See also sister test 'check-subst-prog.test'. # For gen-testsuite-part: ==> try-with-serial-tests <== diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh index de453d222..6785877c8 100755 --- a/t/check-tests-in-builddir.sh +++ b/t/check-tests-in-builddir.sh @@ -54,8 +54,8 @@ chmod a+x bar.test $MAKE check >out 2>&1 || { cat out; exit 1; } cat out -# The simple-tests driver does not strip VPATH components from -# the name of the test, but the parallel-tests driver should. +# The serial test driver does not strip VPATH components from +# the name of the test, but the parallel driver should. if test x"$am_serial_tests" = x"yes"; then grep '^PASS: .*foo\.test *$' out else @@ -68,8 +68,8 @@ rm -f test-suite.log foo.log bar.log FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; exit 1; } cat out -# The simple-tests driver does not strip VPATH components from -# the name of the test, but the parallel-tests driver should. +# The serial test driver does not strip VPATH components from +# the name of the test, but the parallel driver should. if test x"$am_serial_tests" = x"yes"; then grep '^FAIL: .*foo\.test *$' out else diff --git a/t/check8.sh b/t/check8.sh index b968c3a0d..6fcd30ae2 100755 --- a/t/check8.sh +++ b/t/check8.sh @@ -75,7 +75,7 @@ grep '^[^X]*PASS.* bar' stdout grep '^[^X]*PASS.* sub/bar' stdout grep '^[^X]*FAIL.* baz' stdout grep 'XFAIL.* sub/baz' stdout -# 'parallel-tests' should not add circular dependencies. +# The parallel test driver should cause circular dependencies. # Look for known warnings from a couple of 'make' implementations. grep -i 'circular.*dependency' stderr && exit 1 grep -i 'graph cycles' stderr && exit 1 diff --git a/t/clean2.sh b/t/clean2.sh deleted file mode 100755 index 32cc2c8f9..000000000 --- a/t/clean2.sh +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -# Copyright (C) 2004-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/>. - -# Make sure distclean works in cygnus mode. -# Report from Daniel Jacobowitz. - -. ./defs || exit 1 - -cat >> configure.ac << 'END' -AM_MAINTAINER_MODE -AC_CONFIG_FILES([sub/Makefile]) -AC_OUTPUT -END - -cat > Makefile.am << 'END' -SUBDIRS = sub - -data_DATA = bar - -bar: - touch $@ - -DISTCLEANFILES = bar -END - -mkdir sub - -cat > sub/Makefile.am << 'END' -data_DATA = foo - -foo: - touch $@ - -CLEANFILES = $(data_DATA) -END - -$ACLOCAL -$AUTOCONF -$AUTOMAKE --cygnus -Wno-obsolete - -./configure -$MAKE -ls -l -test -f bar -test -f sub/foo -$MAKE distclean -ls -l -test ! -r bar -test ! -r sub/foo -test ! -r Makefile -test ! -r config.status -test -f Makefile.in -test -f configure - -: diff --git a/t/comment7.sh b/t/comment7.sh index a4f8d886e..7e45853f5 100755 --- a/t/comment7.sh +++ b/t/comment7.sh @@ -54,4 +54,4 @@ sed -n '/^#.*VAR.*COND_FALSE/ { }' Makefile.in | grep '@COND_FALSE@VAR = bar' -: +: diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh index 97f8d8476..419d80292 100755 --- a/t/compile_f_c_cxx.sh +++ b/t/compile_f_c_cxx.sh @@ -39,8 +39,8 @@ $ACLOCAL $AUTOMAKE # Look for the macros at the beginning of rules. -$FGREP "$tab\$(COMPILE)" Makefile.in -$FGREP "$tab\$(CXXCOMPILE)" Makefile.in -$FGREP "$tab\$(F77COMPILE)" Makefile.in +$FGREP "$tab\$(AM_V_CC)\$(COMPILE)" Makefile.in +$FGREP "$tab\$(AM_V_CXX)\$(CXXCOMPILE)" Makefile.in +$FGREP "$tab\$(AM_V_F77)\$(F77COMPILE)" Makefile.in : diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh index 5a942da5b..75024f679 100755 --- a/t/confh-subdir-clean.sh +++ b/t/confh-subdir-clean.sh @@ -19,7 +19,7 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([sub/config.h:sub/config.hin]) +AC_CONFIG_HEADERS([sub/config.h:sub/config.hin]) AC_OUTPUT END diff --git a/t/confh.sh b/t/confh.sh index c86b63e84..140775773 100755 --- a/t/confh.sh +++ b/t/confh.sh @@ -20,7 +20,7 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([include/config.h]) +AC_CONFIG_HEADERS([include/config.h]) AC_OUTPUT END diff --git a/t/confh4.sh b/t/confh4.sh index 2f52add86..06ae96fbb 100755 --- a/t/confh4.sh +++ b/t/confh4.sh @@ -26,7 +26,7 @@ cat >> configure.ac << 'END' AC_CONFIG_FILES([include/Makefile]) -AM_CONFIG_HEADER([include/config.h]) +AC_CONFIG_HEADERS([include/config.h]) AC_PROG_CC END diff --git a/t/confh6.sh b/t/confh6.sh index 5479491ca..fa6aab444 100755 --- a/t/confh6.sh +++ b/t/confh6.sh @@ -21,7 +21,7 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([subdir/config.h]) +AC_CONFIG_HEADERS([subdir/config.h]) AC_OUTPUT END diff --git a/t/confh7.sh b/t/confh7.sh index d771b3d96..ec0edbe9d 100755 --- a/t/confh7.sh +++ b/t/confh7.sh @@ -20,7 +20,7 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([config.h two.h]) +AC_CONFIG_HEADERS([config.h two.h]) END : > Makefile.am diff --git a/t/confh8.sh b/t/confh8.sh index 45fbe8e5f..7379a341d 100755 --- a/t/confh8.sh +++ b/t/confh8.sh @@ -20,7 +20,7 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([one.h two.h]) +AC_CONFIG_HEADERS([one.h two.h]) AC_OUTPUT END diff --git a/t/confsub.sh b/t/confsub.sh index 979c66560..de21d51e1 100755 --- a/t/confsub.sh +++ b/t/confsub.sh @@ -21,7 +21,7 @@ cat >> configure.ac << 'END' AC_CONFIG_FILES([subdir/Makefile]) -AM_CONFIG_HEADER([subdir/config.h:subdir/config.hin]) +AC_CONFIG_HEADERS([subdir/config.h:subdir/config.hin]) AC_OUTPUT END diff --git a/t/cygnus-check-without-all.sh b/t/cygnus-check-without-all.sh deleted file mode 100755 index 8b3c6e102..000000000 --- a/t/cygnus-check-without-all.sh +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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, in cygnus mode, target "check" does not depend target -# "all". - -. ./defs || exit 1 - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -AC_OUTPUT -END - -cat > Makefile.am <<'END' -all-local: - : > all-target-has-failed - exit 1 -check-local: - touch check-target-has-run -END - -$ACLOCAL -$AUTOMAKE --cygnus -Wno-obsolete - -$EGREP '(^| )all.*(:|:.* )check' Makefile.in && exit 1 - -$AUTOCONF -./configure - -$MAKE check -test -f check-target-has-run -test ! -r all-target-has-failed -# Sanity checks. -$MAKE && exit 1 -test -f all-target-has-failed - -: diff --git a/t/cygnus-dependency-tracking.sh b/t/cygnus-dependency-tracking.sh deleted file mode 100755 index 6fe7edea5..000000000 --- a/t/cygnus-dependency-tracking.sh +++ /dev/null @@ -1,74 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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 cygnus mode disables automatic dependency tracking. -# And check that this *cannot* be overridden. - -required=cc -. ./defs || exit 1 - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -AC_PROG_CC -AC_OUTPUT -END - -cat > Makefile.am <<'END' -AUTOMAKE_OPTIONS = -Wno-obsolete -bin_PROGRAMS = foo -foo_SOURCES = foo.c -.PHONY: test-nodeps -test-nodeps: - test ! -d .deps - test ! -d _deps - test ! -d '$(DEPDIR)' -END - -cat > foo.c <<'END' -#include "bar.h" -int main () -{ - GIVE_BACK 0; -} -END - -cat > bar.sav <<'END' -#define GIVE_BACK return -END - -cp bar.sav bar.h - -$ACLOCAL -$AUTOMAKE --include-deps --cygnus --include-deps -$AUTOCONF - -# Unknown options should cause just warnings from configure. -./configure --enable-dependency-tracking -$MAKE -$MAKE test-nodeps - -: > bar.h -$MAKE -$MAKE test-nodeps - -# Sanity check. -$MAKE clean -$MAKE >out 2>&1 && { cat out; exit 1; } -cat out -# Not all compilers mention the undefined symbol in the error message. -grep GIVE_BACK out || grep main out - -: diff --git a/t/cygnus-imply-foreign.sh b/t/cygnus-imply-foreign.sh deleted file mode 100755 index 9a5ef7ff9..000000000 --- a/t/cygnus-imply-foreign.sh +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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 'cygnus' mode imply 'foreign' mode. - -. ./defs || exit 1 - -cat >> configure.ac <<'END' -# This is *required* in cygnus mode -AM_MAINTAINER_MODE -END - -$ACLOCAL - -: > Makefile.am - -# We want complete control automake flags, while honouring the -# user overrides for $AUTOMAKE. -AUTOMAKE=$am_original_AUTOMAKE - -# Sanity check: gnu mode must complain about missing files and -# portability problems. -AUTOMAKE_fails -grep 'required file.*README' stderr - -# But cygnus mode should imply foreign mode, so no complaints. -# And cygnus mode should by able to override gnu and gnits modes. -$AUTOMAKE --cygnus -Werror -$AUTOMAKE --gnu --cygnus -Werror -$AUTOMAKE --gnits --cygnus -Werror - -# Try again, this time enabling cygnus mode from Makefile.am. -cp Makefile.am Makefile.sav -echo 'AUTOMAKE_OPTIONS = gnu cygnus' >> Makefile.am -$AUTOMAKE -Werror -mv -f Makefile.sav Makefile.am - -# Try again, this time enabling cygnus mode from configure.ac. -cp configure.ac configure.sav -sed 's/^AM_INIT_AUTOMAKE/&([gnits cygnus])/' configure.sav >configure.ac -cmp configure.ac configure.sav && fatal_ 'failed to edit configure.ac' - -$ACLOCAL --force -$AUTOMAKE -Werror -mv -f configure.sav configure.ac - -: diff --git a/t/cygnus-no-dist.sh b/t/cygnus-no-dist.sh deleted file mode 100755 index af2c45f59..000000000 --- a/t/cygnus-no-dist.sh +++ /dev/null @@ -1,86 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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 cygnus mode forbids creation of distribution tarball. - -. ./defs || exit 1 - -echo AM_MAINTAINER_MODE >> configure.ac -mv -f configure.ac configure.stub - -cat configure.stub - > configure.ac <<'END' -AC_OUTPUT -END - -: > Makefile.am - -$ACLOCAL -$AUTOCONF -$AUTOMAKE --cygnus -Wno-obsolete - -./configure -$MAKE - -for target in dist distdir distcheck dist-all dist-gzip; do - $MAKE -n $target >out 2>&1 && { cat out; exit 1; } - cat out - grep $target out -done - -# Now check that cygnus mode in a subdirectory disables -# distribution-building in that subdirectory. - -cat > Makefile.am <<'END' -SUBDIRS = sub1 sub2 -END - -mkdir sub1 sub2 -: > sub1/Makefile.am -cat > sub2/Makefile.am <<'END' -# The '-Wall' after 'cygnus' should ensure no warning gets -# unintentionally disabled. We are particularly interested -# in override warnings, for when (below) we add the 'distdir' -# target. -AUTOMAKE_OPTIONS = cygnus -Wall -# This is required because the 'cygnus' option is now deprecated. -AUTOMAKE_OPTIONS += -Wno-obsolete -END - -cat configure.stub - > configure.ac <<'END' -AC_CONFIG_FILES([sub1/Makefile sub2/Makefile]) -AC_OUTPUT -END - -$AUTOCONF -$AUTOMAKE - -./configure -$MAKE -cd sub2 -$MAKE -n distdir >out 2>&1 && { cat out; exit 1; } -grep distdir out -cd .. - -cat >> sub2/Makefile.am <<'END' -distdir: -END -$AUTOMAKE sub2/Makefile -./config.status sub2/Makefile - -$MAKE distdir -$MAKE dist - -: diff --git a/t/cygnus-no-installinfo.sh b/t/cygnus-no-installinfo.sh deleted file mode 100755 index 9102484eb..000000000 --- a/t/cygnus-no-installinfo.sh +++ /dev/null @@ -1,55 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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 cygnus mode enables the 'no-installinfo' option. - -required=makeinfo -. ./defs || exit 1 - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -AC_OUTPUT -END - -cat > Makefile.am <<'END' -info_TEXINFOS = foo.texi -END - -cat > foo.texi <<'END' -@setfilename foo.info -END - -$ACLOCAL -# -Wno-override works around a buglet in definition of $(MAKEINFO) -# in cygnus mode; see also xfailing test 'txinfo5.test'. -# -Wno-obsolete accounts for the fact that the cygnus mode is now -# deprecated. -$AUTOMAKE --cygnus -Wno-override -Wno-obsolete -$AUTOCONF - -cwd=$(pwd) || exit 1 -./configure --prefix="$cwd"/_inst -$MAKE -$MAKE install -test ! -d _inst -test ! -r foo.info -test ! -d _inst/share/info -$MAKE install-info -ls -l _inst -test -f foo.info -test -f _inst/share/info/foo.info - -: diff --git a/t/cygnus-deprecation.sh b/t/cygnus-no-more.sh index 551d0e66a..66ef57d45 100755 --- a/t/cygnus-deprecation.sh +++ b/t/cygnus-no-more.sh @@ -20,37 +20,18 @@ . ./defs || exit 1 -warn_rx='support for Cygnus.*trees.*deprecated' - -cat >> configure.ac <<'END' -AC_PROG_CC -AM_MAINTAINER_MODE -END +warn_rx='support for Cygnus.*trees.*removed' $ACLOCAL -$AUTOCONF - -: > Makefile.am -# 'cygnus' option from command line -$AUTOMAKE --cygnus -Wno-obsolete -AUTOMAKE_fails --cygnus -grep "^automake.*: .*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete --cygnus -grep "^automake.*: .*$warn_rx" stderr -AUTOMAKE_fails --cygnus -Wnone -Wobsolete -grep "^automake.*: .*$warn_rx" stderr - -rm -rf autom4te*.cache +# Use of 'cygnus' option must raise an unconditional error, not a +# warning. +AUTOMAKE="$am_original_AUTOMAKE -Wnone -Wno-error" # 'cygnus' option in Makefile.am echo "AUTOMAKE_OPTIONS = cygnus" > Makefile.am -cat Makefile.am # For debugging. -$AUTOMAKE -Wno-obsolete AUTOMAKE_fails grep "^Makefile\.am:1:.*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete -grep "^Makefile\.am:1:.*$warn_rx" stderr rm -rf autom4te*.cache @@ -59,10 +40,7 @@ rm -rf autom4te*.cache sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([cygnus])|" configure.ac > t diff configure.ac t && fatal_ "failed to edit configure.ac" mv -f t configure.ac -$AUTOMAKE -Wno-obsolete AUTOMAKE_fails grep "^configure\.ac:2:.*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete -grep "^configure\.ac:2:.*$warn_rx" stderr : diff --git a/t/cygnus-requires-maintainer-mode.sh b/t/cygnus-requires-maintainer-mode.sh deleted file mode 100755 index 978df8cf4..000000000 --- a/t/cygnus-requires-maintainer-mode.sh +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-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, in cygnus mode, maintainer mode is required. - -. ./defs || exit 1 - -: > Makefile.am - -$ACLOCAL -AUTOMAKE_fails -Wno-obsolete --cygnus -grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr - -cat >> configure.ac <<'END' -AC_CONFIG_FILES([sub/Makefile]) -END - -cat > Makefile.am <<'END' -SUBDIRS = sub -END - -mkdir sub -cat > sub/Makefile.am <<'END' -AUTOMAKE_OPTIONS = -Wno-obsolete cygnus -END - -rm -rf autom4te.cache -$ACLOCAL -AUTOMAKE_fails -grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -END - -rm -rf autom4te.cache -$ACLOCAL -$AUTOMAKE --cygnus -Wno-obsolete - -: diff --git a/t/depend5.sh b/t/depend5.sh index 2bc6a8f5a..8b2371ec6 100755 --- a/t/depend5.sh +++ b/t/depend5.sh @@ -47,9 +47,8 @@ else depdir= fi -# For the fun of it, we should also cope with makefile -# names that contain weird characters, with Autoconf 2.62 -# and newer. +# For the fun of it, we should also cope with Makefile names +# that contain weird characters and newer. # Pick the first name that the file system will accept. for name in \ 'weird name with $ `#() &! characters"' \ diff --git a/t/dirlist.sh b/t/dirlist.sh index e18877711..319726c5d 100755 --- a/t/dirlist.sh +++ b/t/dirlist.sh @@ -19,7 +19,7 @@ . ./defs || exit 1 cat > configure.ac <<EOF -AC_INIT +AC_INIT([$me], [1.0]) AM_INIT_GUILE_MODULE EOF @@ -29,7 +29,7 @@ echo ./dirlist-test > acdir/dirlist cat >dirlist-test/dirlist-check.m4 <<'END' AC_DEFUN([AM_INIT_GUILE_MODULE],[ . $srcdir/../GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_INIT_AUTOMAKE(foreign) AC_CONFIG_AUX_DIR(..) module=[$1] AC_SUBST(module)]) diff --git a/t/dirlist2.sh b/t/dirlist2.sh index 5a11769c2..26320f60e 100755 --- a/t/dirlist2.sh +++ b/t/dirlist2.sh @@ -19,7 +19,7 @@ . ./defs || exit 1 cat > configure.ac <<EOF -AC_INIT +AC_INIT([$me], [1.0]) AM_INIT_GUILE_MODULE AM_FOO_BAR EOF @@ -27,12 +27,7 @@ EOF mkdir dirlist21-test dirlist22-test cat >dirlist21-test/dirlist21-check.m4 <<'END' -AC_DEFUN([AM_INIT_GUILE_MODULE],[ -. $srcdir/../GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AC_CONFIG_AUX_DIR(..) -module=[$1] -AC_SUBST(module)]) +AC_DEFUN([AM_INIT_GUILE_MODULE],[. $srcdir/../GUILE-VERSION]) END cat >dirlist22-test/dirlist22-check.m4 <<'END' diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh index eb6b98c33..d50983629 100755 --- a/t/dist-auxdir-many-subdirs.sh +++ b/t/dist-auxdir-many-subdirs.sh @@ -41,7 +41,7 @@ do_check () unindent > configure.ac << END AC_INIT([$me], [$count]) AC_CONFIG_AUX_DIR([$auxdir]) - AM_INIT_AUTOMAKE([parallel-tests]) + AM_INIT_AUTOMAKE AC_PROG_CC # We don't want to require python or emcas in this test, so # the tricks below. diff --git a/t/distcom4.sh b/t/distcom4.sh index 400533c27..c7088eb72 100755 --- a/t/distcom4.sh +++ b/t/distcom4.sh @@ -18,7 +18,6 @@ # This tries to distribute a file from a subdirectory, without # Makefile in that directory. distcom5.test performs the same # test with a Makefile in the directory. -# Also make sure that README appears first in DIST_COMMON. . ./defs || exit 1 @@ -71,7 +70,5 @@ cat dc.txt # For debugging. test 1 -eq $(grep -c tests dc.txt) grep configure dc.txt -# README must come first. -grep 'DIST_COMMON = README' Makefile.in : diff --git a/t/dollarvar.sh b/t/dollarvar.sh index f28ce04dd..adaf178ec 100755 --- a/t/dollarvar.sh +++ b/t/dollarvar.sh @@ -35,6 +35,7 @@ blo = $(foo${x}) EOF $ACLOCAL + AUTOMAKE_fails -Wportability grep 'Makefile.am:2' stderr grep 'Makefile.am:3' stderr @@ -43,15 +44,7 @@ grep 'Makefile.am:5' stderr grep 'Makefile.am:6' stderr grep 'Makefile.am:7' stderr -# On the other hand, if we allow 'silent-rules' mode, then we need to -# allow recursive variable expansion, too. - -# This should work with the AM_SILENT_RULES macro. -$sleep -echo 'AM_SILENT_RULES' >> configure.ac - -$ACLOCAL --force -AUTOMAKE_fails -Wportability +AUTOMAKE_fails -Wportability -Wno-portability-recursive grep 'Makefile.am:2' stderr grep 'Makefile.am:3' stderr grep 'Makefile.am:4' stderr @@ -22,12 +22,7 @@ cat >> configure.ac << 'END' AC_PROG_F77 AC_PROG_FC AC_PROG_OBJC -# FIXME: this is to cater to older autoconf; remove this once we -# FIXME: automake requires Autoconf 2.65 or later. -m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX], [ - AC_SUBST([OBJCXX], [whocares]) - AM_CONDITIONAL([am__fastdepOBJCXX], [whocares]) -]) +AC_PROG_OBJCXX AM_PROG_UPC END diff --git a/t/flavor.sh b/t/flavor.sh index 8999795ce..91b334176 100755 --- a/t/flavor.sh +++ b/t/flavor.sh @@ -57,21 +57,4 @@ for flavor in --gnits --gnu --foreign --ignore-deps; do done -# Cygnus mode is deprecated now, and must be handled separately. -$AUTOMAKE --cygnus -Wno-obsolete -./configure --enable-maintainer-mode -grep " --cygnus" Makefile -$MAKE -# Two code paths in configure.am: -# - either a file in $(am__configure_deps) has been updated ... -$sleep -touch aclocal.m4 -$MAKE -grep " --cygnus" Makefile -# - ... or not; i.e., Makefile.am or an included file has. -$sleep -touch Makefile.am -$MAKE -grep " --cygnus" Makefile - : diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh index a42c031d4..1d94dadfa 100755 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@ -61,10 +61,7 @@ AM_GNU_GETTEXT AM_GNU_GETTEXT_VERSION([$autopoint_version]) END -if $am_gettextize_command --force && test -f m4/gettext.m4; then - echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh - echo "export ACLOCAL_PATH" >> get.sh -else +if ! ($am_gettextize_command --force && test -f m4/gettext.m4); then # Older versions of gettext might not have a gettextize program # available, but this doesn't mean the user hasn't made the gettext # macros available, e.g., by properly setting ACLOCAL_PATH. @@ -78,14 +75,14 @@ else fi fi -. ./get.sh +echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh +echo "export ACLOCAL_PATH" >> get.sh -cat >> get.sh <<'END' # Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P' # m4 macro. So we need the following to avoid spurious errors. -ACLOCAL="$ACLOCAL -Wno-obsolete" -AUTOMAKE="$AUTOMAKE -Wno-obsolete" -END +echo 'AC_DEFUN([AM_MKDIR_P], [AC_MKDIR_P([$@])])' >> m4/mk-dirp.m4 + +. ./get.sh $ACLOCAL --force -I m4 || cat >> get.sh <<'END' # We need to use '-Wno-syntax', since we do not want our test suite diff --git a/t/help-silent.sh b/t/help-silent.sh index b7e805e76..601666c76 100755 --- a/t/help-silent.sh +++ b/t/help-silent.sh @@ -14,23 +14,20 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Make sure that our macro 'AM_SILENT_RULES' adds proper text to -# the configure help screen. +# Make sure configure options relative to automake silent rules are +# added to the configure help screen. . ./defs || exit 1 -cat > configure.ac <<END -AC_INIT([$me], [1.0]) -AM_SILENT_RULES -END - +: > Makefile.am $ACLOCAL -mv -f configure.ac configure.tmpl +cp configure.ac configure.tmpl -for args in '' '([])' '([yes])' '([no])'; do - sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.ac - cat configure.ac +for args in '' 'yes' 'no'; do + cp -f configure.tmpl configure.ac + test x"$args" = x || echo "AM_SILENT_RULES([$args])/" >> configure.ac + cat configure.ac # For debugging. $AUTOCONF --force grep_configure_help --enable-silent-rules \ ' less verbose build.*\(undo.*"make V=1".*\)' diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh index 1d8015ccb..b15ecaac8 100755 --- a/t/instdir-texi.sh +++ b/t/instdir-texi.sh @@ -17,7 +17,7 @@ # If $(infodir) is the empty string, then nothing should be installed there. # Likewise for the other install-* targets used for texinfo files. -required='makeinfo-html tex texi2dvi' +required='makeinfo tex texi2dvi' . ./defs || exit 1 dvips --help \ diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh index e0e8001a1..05cf89ab2 100755 --- a/t/java-compile-run-flat.sh +++ b/t/java-compile-run-flat.sh @@ -20,8 +20,8 @@ # This test uses a "flat" setup for the source tree (i.e., everything in # the top-level directory), and forces the use of the old, non-parallel # testsuite driver. The sister test 'java-compile-run-nested.test' do -# similar checks with a more usual, "nested" setup, and using the newer -# 'parallel-tests' driver. +# similar checks with a more usual, "nested" setup, and using the older +# 'serial-tests' driver. required='java javac' am_serial_tests=yes diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh index fccc7415a..f6bb2173f 100755 --- a/t/java-compile-run-nested.sh +++ b/t/java-compile-run-nested.sh @@ -18,11 +18,11 @@ # Also meddle with wrapper scripts, as would be probably seen in a real # "UNIX-style" use case. # This test uses a typical "nested" source tree setup (i.e., different -# components/aspects are separated into different subdirectories), -# and uses the 'parallel-tests' testsuite driver. The sister test -# 'java-compile-run-flat.test' do similar checks with a "flat" setup -# (i.e., everything in the top-level directory), and forcing the use -# of the older non-parallel 'simple-tests' driver. +# components/aspects are separated into different subdirectories), and +# uses the parallel testsuite driver. +# The sister test 'java-compile-run-flat.test' do similar checks with a +# "flat" setup (i.e., everything in the top-level directory), and forcing +# the use of the older 'serial-tests' driver. required='java javac' . ./defs || exit 1 diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 5967fcb5a..e5c08a205 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -109,6 +109,7 @@ t/aclocal-install-fail.sh \ t/aclocal-install-mkdir.sh \ t/aclocal-no-install-no-mkdir.sh \ t/aclocal-verbose-install.sh \ +t/aclocal-autoconf-version-check.sh \ t/ac-output-old.tap \ t/acsilent.sh \ t/acsubst.sh \ @@ -123,7 +124,7 @@ t/alpha2.sh \ t/amhello-cflags.sh \ t/amhello-cross-compile.sh \ t/amhello-binpkg.sh \ -t/aminit-moreargs-deprecation.sh \ +t/aminit-moreargs-no-more.sh \ t/amassign.sh \ t/am-macro-not-found.sh \ t/amopt.sh \ @@ -158,7 +159,6 @@ t/autodist-configure-no-subdir.sh \ t/autodist-no-duplicate.sh \ t/autodist-stamp-vti.sh \ t/autohdr.sh \ -t/autohdr2.sh \ t/autohdr3.sh \ t/autohdr4.sh \ t/autohdrdry.sh \ @@ -172,12 +172,7 @@ t/auxdir-computed.tap \ t/auxdir-misplaced.sh \ t/auxdir-nonexistent.sh \ t/auxdir-unportable.tap \ -t/backcompat.sh \ -t/backcompat2.sh \ -t/backcompat3.sh \ -t/backcompat4.sh \ -t/backcompat5.sh \ -t/backcompat6.sh \ +t/backcompat-acout.sh \ t/backsl.sh \ t/backsl2.sh \ t/backsl3.sh \ @@ -220,7 +215,6 @@ t/check-no-test-driver.sh \ t/check-concurrency-bug9245.sh \ t/checkall.sh \ t/clean.sh \ -t/clean2.sh \ t/colneq.sh \ t/colneq2.sh \ t/colneq3.sh \ @@ -339,13 +333,7 @@ t/cxxlibobj.sh \ t/cxxlink.sh \ t/cxxnoc.sh \ t/cxxo.sh \ -t/cygnus-deprecation.sh \ -t/cygnus-check-without-all.sh \ -t/cygnus-dependency-tracking.sh \ -t/cygnus-imply-foreign.sh \ -t/cygnus-no-dist.sh \ -t/cygnus-no-installinfo.sh \ -t/cygnus-requires-maintainer-mode.sh \ +t/cygnus-no-more.sh \ t/cygwin32.sh \ t/dash.sh \ t/defun.sh \ @@ -669,7 +657,6 @@ t/makevars.sh \ t/man.sh \ t/man2.sh \ t/man3.sh \ -t/man4.sh \ t/man5.sh \ t/man6.sh \ t/man7.sh \ @@ -680,15 +667,10 @@ t/mdate3.sh \ t/mdate4.sh \ t/mdate5.sh \ t/mdate6.sh \ -t/missing.sh \ -t/missing2.sh \ +t/missing-version-mismatch.sh \ t/missing3.sh \ -t/missing4.sh \ -t/missing5.sh \ -t/missing6.sh \ t/am-missing-prog.sh \ t/missing-auxfile-stops-makefiles-creation.sh \ -t/mkdirp-deprecation.sh \ t/mkinstall.sh \ t/mkinst2.sh \ t/mkinst3.sh \ @@ -701,7 +683,6 @@ t/nobase.sh \ t/nobase-libtool.sh \ t/nobase-python.sh \ t/nobase-nodist.sh \ -t/nodef.sh \ t/nodef2.sh \ t/nodep.sh \ t/nodep2.sh \ @@ -725,7 +706,6 @@ t/objcxx-flags.sh \ t/objcxx-deps.sh \ t/objc-megademo.sh \ t/objext-pr10128.sh \ -t/obsolete.sh \ t/oldvars.sh \ t/order.sh \ t/output.sh \ @@ -948,6 +928,7 @@ t/remake-deleted-am-2.sh \ t/remake-deleted-am-subdir.sh \ t/remake-deleted-am.sh \ t/remake-renamed-am.sh \ +t/remake-aclocal-version-mismatch.sh \ t/pr8365-remake-timing.sh \ t/req.sh \ t/reqd.sh \ @@ -979,15 +960,12 @@ t/silent6.sh \ t/silent7.sh \ t/silent8.sh \ t/silent9.sh \ -t/silent-obsolescent-warns.sh \ t/silentcxx.sh \ t/silentcxx-gcc.sh \ t/silentf77.sh \ t/silentf90.sh \ -t/silent-amopts.sh \ t/silent-many-gcc.sh \ t/silent-many-generic.sh \ -t/silent-nowarn.sh \ t/silent-configsite.sh \ t/silent-nested-vars.sh \ t/silent-lex.sh \ @@ -1177,8 +1155,6 @@ t/txinfo.sh \ t/txinfo2.sh \ t/txinfo3.sh \ t/txinfo4.sh \ -t/txinfo5.sh \ -t/txinfo5b.sh \ t/txinfo6.sh \ t/txinfo7.sh \ t/txinfo8.sh \ @@ -1198,7 +1174,6 @@ t/txinfo26.sh \ t/txinfo27.sh \ t/txinfo28.sh \ t/txinfo29.sh \ -t/txinfo30.sh \ t/txinfo31.sh \ t/txinfo32.sh \ t/txinfo33.sh \ @@ -1230,8 +1205,6 @@ t/vars3.sh \ t/vartar.sh \ t/vartypos.sh \ t/vartypo2.sh \ -t/version.sh \ -t/version2.sh \ t/version3.sh \ t/version4.sh \ t/version6.sh \ diff --git a/t/man4.sh b/t/man4.sh deleted file mode 100755 index 2688b7d47..000000000 --- a/t/man4.sh +++ /dev/null @@ -1,105 +0,0 @@ -#! /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/>. - -# Ensure 'make dist' fails when help2man replacement man pages are created. -# -# The assumption here is the following: if the developer uses help2man to -# generate man pages from --help output, then these man pages may not be -# stored in VCS. However, they should be distributed, so that the end user -# that receives the tarball doesn't have to install help2man. If they are -# not distributed, then the developer should make help2man a prerequisite -# to building the package from a tarball, e.g., with a configure check for -# help2man that errors out if it is unavailable. In both cases it is -# sufficient to check only distributed man pages. -# -# Idea of this whole shenanigan is to allow somebody to check out sources from -# a VCS and build and install them without needing help2man installed. The -# installed man pages will be bogus in this case. Typically, this happens -# when developers ask users to try out a fix from VCS; the developers themselves -# will usually have help2man installed (or should install it). - -. ./defs || exit 1 - -cat > Makefile.am << 'END' -dist_man_MANS = $(srcdir)/foo.1 bar.1 -dist_bin_SCRIPTS = foo bar -$(srcdir)/foo.1: - $(HELP2MAN) --output=$@ $(srcdir)/foo -bar.1: - $(HELP2MAN) --output=$(srcdir)/bar.1 $(srcdir)/bar -END - -cat >>configure.ac <<'END' -AM_MISSING_PROG([HELP2MAN], [help2man]) -AC_OUTPUT -END - -cat > foo <<'END' -#! /bin/sh -while test $# -gt 0; do - case $1 in - -h | --help) echo "usage: $0 [OPTIONS]..."; exit 0;; - -v | --version) echo "$0 1.0"; exit 0;; - esac - shift -done -END -cp foo bar -chmod +x foo bar - -mkdir bin -cat > bin/help2man <<'END' -#! /bin/sh -# Fake help2man script that lets 'missing' think it is not installed. -exit 127 -END -chmod +x bin/help2man -PATH=$(pwd)/bin$PATH_SEPARATOR$PATH - -grep_error_messages() -{ - grep ' man pages contain.*missing help2man.* replacement text' stderr \ - && grep 'install help2man' stderr \ - && grep 'regenerate the man pages' stderr \ - || exit 1 -} - -$ACLOCAL -$AUTOMAKE -$AUTOCONF - -./configure -$MAKE -$MAKE dist 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep_error_messages -$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep_error_messages -$MAKE distclean - -mkdir build -cd build -../configure -$MAKE -$MAKE dist 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep_error_messages -$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep_error_messages - -: @@ -65,7 +65,7 @@ cd build ../configure # Sanity check. -grep '^HELP2MAN *=.*/missing --run help2man' Makefile +grep '^HELP2MAN *=.*/missing help2man' Makefile $MAKE $FGREP foobar ../foobar.1 @@ -84,7 +84,7 @@ rm -f *.1 # Remove leftover generated manpages. ./configure # Sanity check. -grep '^HELP2MAN *=.*/missing --run help2man' Makefile +grep '^HELP2MAN *=.*/missing help2man' Makefile $MAKE $FGREP foobar foobar.1 diff --git a/t/missing2.sh b/t/missing-version-mismatch.sh index 7b9c231d8..e4a1033f3 100755 --- a/t/missing2.sh +++ b/t/missing-version-mismatch.sh @@ -16,43 +16,35 @@ # Test missing with version mismatches. +am_create_testdir=empty . ./defs || exit 1 -cat >>configure.ac <<'EOF' -m4_include([v.m4]) -AC_OUTPUT -EOF +get_shell_script missing -: > v.m4 +do_check () +{ + progname=$1; shift; + ./missing "$@" 2>stderr && { cat stderr >&2; exit 1; } + cat stderr >&2 + $FGREP "WARNING: '$progname' is probably too old." stderr +} -: > Makefile.am +echo 'AC_INIT([x], [1.0]) AC_PREREQ([9999])' >> configure.ac -get_shell_script missing +do_check autoconf $AUTOCONF +do_check autoheader $AUTOHEADER +do_check aclocal-$APIVERSION $am_original_ACLOCAL + +cat > configure.ac << 'END' +AC_INIT([x], [0]) +AM_INIT_AUTOMAKE +AC_CONFIG_FILES([Makefile]) +END +echo AUTOMAKE_OPTIONS = 9999.9999 > Makefile.am $ACLOCAL -$AUTOCONF -$AUTOMAKE --add-missing - -# See missing.test for explanations about this. -MYAUTOCONF="./missing --run $AUTOCONF" -unset AUTOCONF - -./configure AUTOCONF="$MYAUTOCONF" - -$MAKE -$sleep -# Hopefully the install version of Autoconf cannot compete with this one... -echo 'AC_PREREQ(9999)' > v.m4 -$MAKE distdir - -# Run again, but without missing, to ensure that timestamps were updated. -export AUTOMAKE ACLOCAL -./configure AUTOCONF="$MYAUTOCONF" -$MAKE - -# Make sure $MAKE fail when timestamps aren't updated and missing is not used. -$sleep -touch v.m4 -$MAKE && exit 1 +: > install-sh +# FIXME: this doesn't work due to a bug in automake (not 'missing'). +#do_check automake-$APIVERSION $am_original_AUTOMAKE : diff --git a/t/missing.sh b/t/missing.sh deleted file mode 100755 index fcca48f85..000000000 --- a/t/missing.sh +++ /dev/null @@ -1,66 +0,0 @@ -#! /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/>. - -# Test missing with version mismatches. - -. ./defs || exit 1 - -cat >>configure.ac <<'EOF' -AC_OUTPUT -EOF - -: > Makefile.am - -get_shell_script missing - -$ACLOCAL -$AUTOCONF -$AUTOMAKE --add-missing - -# Make sure we do use missing, even if the user exported AUTOCONF. -# (We cannot export this new value, because it would be used by Automake -# when tracing, and missing is no good for this.) -MYAUTOCONF="./missing --run $AUTOCONF" -unset AUTOCONF - -./configure AUTOCONF="$MYAUTOCONF" -$MAKE -$sleep -# Hopefully the install version of Autoconf cannot compete with this one... -echo 'AC_PREREQ(9999)' >> aclocal.m4 -$MAKE distdir - -# Try version number suffixes if we can add them safely. -case $MYAUTOCONF in *autoconf) - ./configure AUTOCONF="${MYAUTOCONF}6789" - $MAKE - $sleep - # Hopefully the install version of Autoconf cannot compete with this one... - echo 'AC_PREREQ(9999)' >> aclocal.m4 - $MAKE distdir -esac - -# Run again, but without missing, to ensure that timestamps were updated. -export AUTOMAKE ACLOCAL -./configure AUTOCONF="$MYAUTOCONF" -$MAKE - -# Make sure $MAKE fails when timestamps aren't updated and missing is not used. -$sleep -touch aclocal.m4 -$MAKE && exit 1 - -: diff --git a/t/missing3.sh b/t/missing3.sh index c5db4f038..3a9ba013f 100755 --- a/t/missing3.sh +++ b/t/missing3.sh @@ -23,31 +23,26 @@ get_shell_script missing # b7cb8259 assumed not to exist. -./missing b7cb8259 --version 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep . stderr && exit 1 -./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep WARNING stderr - -./missing --run b7cb8259 --version && exit 1 -./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep WARNING stderr +run_cmd () +{ + st=0; "$@" >stdout 2>stderr || st=$? + cat stdout + cat stderr >&2 + return $st +} + +./missing b7cb8259 --version && exit 1 +grep WARNING stderr && exit 1 +run_cmd ./missing b7cb8259 --grep && exit 1 +grep 'WARNING:.*missing on your system' stderr # missing itself it known to exist :) -./missing ./missing --version 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep . stderr && exit 1 -./missing ./missing --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep WARNING stderr - -./missing --run ./missing --version 2>stderr || { cat stderr >&2; exit 1; } -cat stderr >&2 -grep . stderr && exit 1 -./missing --run ./missing --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 +run_cmd ./missing ./missing --version || exit 1 +grep 'missing .*(GNU [aA]utomake)' stdout +test -s stderr && exit 1 +run_cmd ./missing ./missing --grep && exit 1 grep WARNING stderr && exit 1 -grep Unknown stderr +grep "missing:.* unknown '--grep'" stderr + +: diff --git a/t/missing5.sh b/t/missing5.sh deleted file mode 100755 index 4dcb022c5..000000000 --- a/t/missing5.sh +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh -# Copyright (C) 2006-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 how well 'missing' finds output file names of various tools. -# PR automake/483. - -am_create_testdir=empty -. ./defs || exit 1 - -get_shell_script missing - -# These programs may be invoked by 'missing'. -needed_tools='chmod find sed test touch' -needed_tools_csep=$(echo $needed_tools | sed 's/ /, /g') - -cat >configure.ac <<EOF -AC_INIT([missing4], [1.0]) -m4_foreach([tool], [$needed_tools_csep], - [AC_PATH_PROG(tool, tool, [false]) - AC_CONFIG_FILES(tool, chmod +x tool) - ]) -AC_OUTPUT -EOF - -for tool in $needed_tools; do - unindent >$tool.in <<EOF - #! /bin/sh - exec @$tool@ "\$@" -EOF -done - -$AUTOCONF -./configure - -echo output-file > output-file -cp output-file my--output--file-o - -save_PATH=$PATH -PATH=. -export PATH -missing --help -missing --version -for tool in autom4te help2man makeinfo; do - missing --run $tool -o my--output--file-o input - missing --run $tool --output my--output--file-o input -done -PATH=$save_PATH -export PATH -diff output-file my--output--file-o -test ! -f ./--file-o -test ! -f input diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh deleted file mode 100755 index 8482dea36..000000000 --- a/t/mkdirp-deprecation.sh +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# Copyright (C) 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 the AM_PROG_MKDIR_P macro is deprecated. It will be -# be removed in the next major Automake release. - -. ./defs || exit 1 - -echo AM_PROG_MKDIR_P >> configure.ac -: > Makefile.am - -grep_err () -{ - loc='^configure.ac:4:' - grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr - grep "$loc.* use .*AC_PROG_MKDIR_P" stderr - grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr -} - -$ACLOCAL - -$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep_err - -$AUTOCONF -Werror -Wno-obsolete - -#AUTOMAKE_fails -#grep_err -AUTOMAKE_fails --verbose -Wnone -Wobsolete -grep_err - -$AUTOMAKE -Wno-obsolete - -: diff --git a/t/nodef.sh b/t/nodef.sh deleted file mode 100755 index 979b906d6..000000000 --- a/t/nodef.sh +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# Copyright (C) 2002-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/>. - -# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested. - -. ./defs || exit 1 - -# ------------------------------------------------------------------- -# Do not upgrade this file to use the modern AC_INIT/AM_INIT_AUTOMAKE -# forms. The day these obsolete AC_INIT and AM_INIT_AUTOMAKE forms -# are dropped, just erase the file. -# nodef2.test contains the modern version of this test. -# ------------------------------------------------------------------- - -# First, check that PACKAGE and VERSION are output by default. - -cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN]) -AC_OUTPUT(output) -END - -echo 'DEFS = @DEFS@' > output.in - -$ACLOCAL -$AUTOCONF -./configure - -grep 'DEFS.*-DVERSION=\\"UnIqUe' output - -# Then, check that PACKAGE and VERSION are not output if requested. - -cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN], [no]) -AC_OUTPUT(output) -END - -$ACLOCAL -$AUTOCONF -./configure - -grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1 - -: diff --git a/t/nodep2.sh b/t/nodep2.sh index df411b763..13d117465 100755 --- a/t/nodep2.sh +++ b/t/nodep2.sh @@ -30,12 +30,7 @@ AC_CONFIG_FILES([Makefile]) AC_PROG_CC AC_PROG_CXX AC_PROG_OBJC -# FIXME: this is to cater to older autoconf; remove this once we -# FIXME: automake requires Autoconf 2.65 or later. -m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX], [ - AC_SUBST([OBJCXX], [whocares]) - AM_CONDITIONAL([am__fastdepOBJCXX], [whocares]) -]) +AC_PROG_OBJCXX AM_PROG_AS AM_PROG_GCJ AM_PROG_UPC diff --git a/t/objc-flags.sh b/t/objc-flags.sh index e98a81128..2f65d467c 100755 --- a/t/objc-flags.sh +++ b/t/objc-flags.sh @@ -57,6 +57,6 @@ grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && exit 1 grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1 ./configure OBJCFLAGS=-UERROR -$MAKE +$MAKE : diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh index 876fecbf7..432902971 100755 --- a/t/objc-megademo.sh +++ b/t/objc-megademo.sh @@ -25,8 +25,6 @@ am_create_testdir=empty cat > configure.ac << 'END' AC_INIT([play], [1.3], [bug-automake@gnu.org]) -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([play.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -87,13 +85,7 @@ END ## Run Autotools. libtoolize -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOHEADER $AUTOCONF $AUTOMAKE --add-missing diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh index e00106d79..de94a48b6 100755 --- a/t/objcxx-basic.sh +++ b/t/objcxx-basic.sh @@ -30,19 +30,10 @@ grep "add .*'AC_PROG_OBJCXX'" stderr rm -rf autom4te*.cache cat >> configure.ac <<'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX END -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - exit 1 # Some other aclocal failure. -fi - +$ACLOCAL $AUTOMAKE $EGREP '^\.SUFFIXES:.* \.mm( |$)' Makefile.in diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh index fef4ac549..950663bfe 100755 --- a/t/objcxx-deps.sh +++ b/t/objcxx-deps.sh @@ -20,8 +20,6 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_OUTPUT END @@ -50,13 +48,7 @@ int main (void) } END -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOCONF $AUTOMAKE --add-missing diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh index 8f5df45cb..6e79fc59b 100755 --- a/t/objcxx-flags.sh +++ b/t/objcxx-flags.sh @@ -20,8 +20,6 @@ . ./defs || exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_OUTPUT END @@ -50,14 +48,7 @@ for i in 2 4; do END done -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - exit 1 # Some other aclocal failure. -fi - +$ACLOCAL $AUTOCONF $AUTOMAKE -a @@ -67,6 +58,6 @@ grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in && exit 1 grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && exit 1 ./configure OBJCXXFLAGS=-UERROR -$MAKE +$MAKE : diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh index e4e776789..cf62e31f6 100755 --- a/t/objcxx-minidemo.sh +++ b/t/objcxx-minidemo.sh @@ -21,8 +21,6 @@ required=native . ./defs || exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_CONFIG_HEADERS([config.h]) AC_OUTPUT @@ -57,13 +55,7 @@ int main (void) } END -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOCONF $AUTOHEADER $AUTOMAKE --add-missing diff --git a/t/obsolete.sh b/t/obsolete.sh deleted file mode 100755 index 2a21f54ed..000000000 --- a/t/obsolete.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# Copyright (C) 1996-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 to make sure obsolete macros can be autoupdated. - -# We need the following indirection in case someone exported e.g. -# AUTOUPDATE='autoupdate --verbose'. -set x ${AUTOUPDATE-autoupdate} -required=$2 -. ./defs || exit 1 - -cat > configure.ac << 'END' -AC_INIT -END - -$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \ - "$am_automake_acdir/obsolete.m4" > obs -cat obs >> configure.ac -$PERL -ne 'chomp; print "grep $_ output || exit 1\n"; ' obs > obs.1 -$PERL -ne 'chomp; print "grep $_ configure.ac && exit 1\n"; ' obs > obs.2 -echo : >> obs.1 # Since it will be sourced, it must end with a success. -echo : >> obs.2 # Likewise. - -cat configure.ac # For debugging. -cat obs.1 # Likewise. -cat obs.2 # Likewise. - -# Sanity check. Make sure we have added something to configure.ac. -test $(wc -l <configure.ac) -gt 1 - -$ACLOCAL - -# Expect Autoconf to complain about each of the macros in obs. -$AUTOCONF -Wobsolete >output 2>&1 || { cat output; exit 1; } -cat output -. ./obs.1 -# Make sure Autoupdate remove each of these macros. -$AUTOUPDATE -. ./obs.2 - -# Autoconf should be able to grok the updated configure.ac. -$AUTOCONF - -: diff --git a/t/parallel-tests-driver-install.sh b/t/parallel-tests-driver-install.sh index aa9ac120c..78dff6b8b 100755 --- a/t/parallel-tests-driver-install.sh +++ b/t/parallel-tests-driver-install.sh @@ -15,19 +15,15 @@ # 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. +# in the correct directory. +am_create_testdir=empty . ./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]) +AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile sub/Makefile]) AC_OUTPUT END @@ -52,41 +48,6 @@ 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 +grep '^parallel-tests:.*installing.*my_aux_dir/test-driver' stderr : diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh index 3f6172de2..382ae206b 100755 --- a/t/parallel-tests-dry-run-1.sh +++ b/t/parallel-tests-dry-run-1.sh @@ -14,7 +14,7 @@ # 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 parallel-tests interactions with "make -n". +# Check interactions between the parallel test harness and "make -n". # See also sister test 'parallel-tests-dry-run-2.test'. . ./defs || exit 1 diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh index 0bd6523a0..940cab29f 100755 --- a/t/parallel-tests-dry-run-2.sh +++ b/t/parallel-tests-dry-run-2.sh @@ -14,7 +14,7 @@ # 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 parallel-tests interactions with "make -n". +# Check interactions between the parallel test harness and "make -n". # See also sister test 'parallel-tests-dry-run-1.test'. . ./defs || exit 1 diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap index bce25b3be..76e89f26f 100755 --- a/t/parallel-tests-interrupt.tap +++ b/t/parallel-tests-interrupt.tap @@ -14,7 +14,7 @@ # 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 the parallel-tests driver removed incomplete log files +# Check that the parallel testsuite harness removes incomplete log files # when interrupt upon some signal. This test is definitely too hacky, # but we couldn't find a better way to deal with inter-processes # signals and the whole process-synchronization mess. diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh index 420a54a20..a12f53422 100755 --- a/t/parallel-tests-many.sh +++ b/t/parallel-tests-many.sh @@ -14,8 +14,8 @@ # 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 the parallel-tests harness does not hit errors due to -# an exceeded command line length when there are many tests. +# Check that the parallel testsuite harness does not hit errors due +# to an exceeded command line length when there are many tests. # For automake bug#7868. This test is currently expected to fail. . ./defs || exit 1 diff --git a/t/parallel-tests-no-color-in-log.sh b/t/parallel-tests-no-color-in-log.sh index fe1036b07..c46993fef 100755 --- a/t/parallel-tests-no-color-in-log.sh +++ b/t/parallel-tests-no-color-in-log.sh @@ -27,7 +27,7 @@ END cat >Makefile.am <<'END' LOG_COMPILER = $(SHELL) -AUTOMAKE_OPTIONS = color-tests parallel-tests +AUTOMAKE_OPTIONS = color-tests TESTS = pass fail skip xpass xfail error XFAIL_TESTS = xpass xfail END diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh index 88a98522e..61cbad50b 100755 --- a/t/parallel-tests-reset-term.sh +++ b/t/parallel-tests-reset-term.sh @@ -14,7 +14,7 @@ # 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 the parallel-tests driver correctly handle overrides of the +# Check that the testsuite harness correctly handle overrides of the # TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT. required='grep-nonprint' diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh index d57133f97..b7bb481d1 100755 --- a/t/parallel-tests-subdir.sh +++ b/t/parallel-tests-subdir.sh @@ -14,7 +14,7 @@ # 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 the parallel-tests driver creates parent directories for +# Check that the parallel test harness creates parent directories for # the log files when needed. . ./defs || exit 1 diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh index 679a05a79..296a62102 100755 --- a/t/perf/testsuite-summary.sh +++ b/t/perf/testsuite-summary.sh @@ -45,7 +45,7 @@ for i in $(seq_ 1 $count); do echo :test-result: PASS >> $i.trs echo :copy-in-global-log: yes >> $i.trs echo TESTS += $i.t -done >> Makefile.am +done >> Makefile.am # Re-enable shell traces. set -x diff --git a/t/missing4.sh b/t/remake-aclocal-version-mismatch.sh index 22d31d0b2..22d31d0b2 100755 --- a/t/missing4.sh +++ b/t/remake-aclocal-version-mismatch.sh diff --git a/t/remake6.sh b/t/remake6.sh index b6c580ca3..2146b381a 100755 --- a/t/remake6.sh +++ b/t/remake6.sh @@ -39,7 +39,7 @@ do_check () { $MAKE >stdout || { cat stdout; exit 1; } cat stdout - test $(grep -c " --run " stdout) -eq 1 + test $(grep -c "/missing " stdout) -eq 1 } # Now, we are set up. Ensure that, for either missing Makefile.in, @@ -19,17 +19,12 @@ . ./defs || exit 1 cat > configure.ac <<EOF -AC_INIT +AC_INIT([$me], [1.0]) AM_INIT_GUILE_MODULE EOF cat > acinclude.m4 << 'END' -AC_DEFUN([AM_INIT_GUILE_MODULE],[ -. $srcdir/../GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AC_CONFIG_AUX_DIR(..) -module=[$1] -AC_SUBST(module)]) +AC_DEFUN([AM_INIT_GUILE_MODULE], [AM_INIT_AUTOMAKE([whocares])]) END $ACLOCAL diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh index 95ed31329..fa1626e93 100755 --- a/t/self-check-explicit-skips.sh +++ b/t/self-check-explicit-skips.sh @@ -43,7 +43,7 @@ test $? -eq 77 || exit 1 run_dummy_test 'sh -c "exit 77"' am_explicit_skips=no test $? -eq 77 || exit 1 -run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes +run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes test $? -eq 78 || exit 1 run_dummy_test 'sh -c "exit 77"' am_explicit_skips=y diff --git a/t/silent-amopts.sh b/t/silent-amopts.sh deleted file mode 100755 index c7414537b..000000000 --- a/t/silent-amopts.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Copyright (C) 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 automake complaints if the 'silent-rules' option is -# used in AUTOMAKE_OPTIONS. - -. ./defs || exit 1 - -echo AUTOMAKE_OPTIONS = silent-rules > Makefile.am - -$ACLOCAL -AUTOMAKE_fails -grep "^Makefile\.am:1:.*'silent-rules'.*AM_INIT_AUTOMAKE" stderr - -: diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh index 4adc60137..c70d8c860 100755 --- a/t/silent-configsite.sh +++ b/t/silent-configsite.sh @@ -21,7 +21,7 @@ . ./defs || exit 1 cat >> configure.ac <<'EOF' -AM_SILENT_RULES +# This line will be edited later to force silent-rules default. AC_OUTPUT EOF @@ -51,8 +51,9 @@ $MAKE distclean : 'Disable by default in configure.ac, enable by default in config.site' -sed 's/^AM_SILENT_RULES/&([no])/' configure.ac > configure.tmp -mv -f configure.tmp configure.ac +sed 's/.*silent-rules default.*/AM_SILENT_RULES([no])/' configure.ac > t +diff t configure.ac && fatal_ "editing configure.ac" +mv -f t configure.ac $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing @@ -67,8 +68,9 @@ $MAKE distclean : 'Enable by default in configure.ac, disable by default in config.site' -sed 's/^AM_SILENT_RULES/&([yes])/' configure.ac > configure.tmp -mv -f configure.tmp configure.ac +sed 's/.*AM_SILENT_RULES.*/AM_SILENT_RULES([yes])/' configure.ac > t +diff t configure.ac && fatal_ "editing configure.ac" +mv -f t configure.ac $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing diff --git a/t/silent-lex.sh b/t/silent-lex.sh index ca2164f76..e9c6b5556 100755 --- a/t/silent-lex.sh +++ b/t/silent-lex.sh @@ -22,7 +22,6 @@ required='cc lex' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_LEX AC_CONFIG_FILES([sub/Makefile]) diff --git a/t/silent-many-gcc.sh b/t/silent-many-gcc.sh index e78081285..433aaa62d 100755 --- a/t/silent-many-gcc.sh +++ b/t/silent-many-gcc.sh @@ -95,7 +95,6 @@ do_and_check_verbose_build () mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_F77 diff --git a/t/silent-many-generic.sh b/t/silent-many-generic.sh index c30ae3c81..0837a5da6 100755 --- a/t/silent-many-generic.sh +++ b/t/silent-many-generic.sh @@ -96,7 +96,6 @@ do_and_check_verbose_build () mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_F77 AC_PROG_FC diff --git a/t/silent-nowarn.sh b/t/silent-nowarn.sh deleted file mode 100755 index 9eb759d6b..000000000 --- a/t/silent-nowarn.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 the 'silent-rules' mode suppresses the warnings for recursive -# make variable expansions. This should happen regardless of whether and -# where these warnings are requested. - -. ./defs || exit 1 - -cat > configure.ac <<END -AC_INIT([$me], [1.0]) -# Yes, we repeat the warnings two times, both before and after -# 'silent-rules'. This is deliberate. -AM_INIT_AUTOMAKE([gnu -Wall -Wportability-recursive - silent-rules - -Wall -Wportability-recursive]) -AC_CONFIG_FILES([Makefile]) -END - -cat > Makefile.am <<'END' -AUTOMAKE_OPTIONS = gnu -Wall -Wportability-recursive -foo = $($(v)) $(x$(v)) $($(v)x) $(y$(v)z) -END - -# Files required bu gnu strictness. -touch AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS - -$ACLOCAL -$AUTOMAKE --gnu -Wall -Wportability-recursive - -: diff --git a/t/silent-obsolescent-warns.sh b/t/silent-obsolescent-warns.sh deleted file mode 100755 index 38d845c91..000000000 --- a/t/silent-obsolescent-warns.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009-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/>. - -# Some checks about silent-rules mode and warnings. - -. ./defs || exit 1 - -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF - -cat > Makefile.am <<'EOF' -my_verbose = $(my_verbose_$(V)) -my_verbose_ = $(my_verbose_$(AM_DEFAULT_VERBOSITY)) -my_verbose_0 = @echo " PKG-GEN $@"; -foo: foo.in - $(my_verbose)cp $(srcdir)/foo.in $@ -EOF - -$ACLOCAL -$AUTOMAKE --add-missing - -cat > configure.ac <<'END' -AC_INIT([silent6], [1.0]) -AM_INIT_AUTOMAKE([-Wall]) -AC_CONFIG_FILES([Makefile]) -END - -rm -rf autom4te*.cache -$ACLOCAL -AUTOMAKE_fails -grep 'my_verbose_\$(V.*non-POSIX ' stderr -$AUTOMAKE -Wno-error - -# AM_SILENT_RULES should turn off the warning. -echo 'AM_SILENT_RULES' >> configure.ac -rm -rf autom4te*.cache -$ACLOCAL -$AUTOMAKE -grep 'AM_V_GEN' Makefile.in -$AUTOMAKE --force -Wno-all -Wportability -grep 'AM_V_GEN' Makefile.in - -# The 'silent-rules' option to AM_INIT_AUTOMAKE should work likewise. -cat > configure.ac <<'END' -AC_INIT([silent6], [1.0]) -AM_INIT_AUTOMAKE([silent-rules]) -AC_CONFIG_FILES([Makefile]) -END -rm -rf autom4te*.cache -$ACLOCAL -$AUTOMAKE -grep 'AM_V_GEN' Makefile.in -$AUTOMAKE --force -Wno-all -Wportability -grep 'AM_V_GEN' Makefile.in - -: diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh index e89fe5af7..632404735 100755 --- a/t/silent-yacc-headers.sh +++ b/t/silent-yacc-headers.sh @@ -23,7 +23,6 @@ required='cc yacc' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_YACC AC_PROG_CC AC_OUTPUT diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh index 2a0761b13..779f49834 100755 --- a/t/silent-yacc.sh +++ b/t/silent-yacc.sh @@ -23,7 +23,6 @@ required='cc yacc' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_YACC AC_CONFIG_FILES([sub/Makefile]) diff --git a/t/silent.sh b/t/silent.sh index 639bef466..633cdd8a8 100755 --- a/t/silent.sh +++ b/t/silent.sh @@ -24,7 +24,6 @@ required=cc mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/t/silent2.sh b/t/silent2.sh index 550907f7e..1d67f7e0f 100755 --- a/t/silent2.sh +++ b/t/silent2.sh @@ -25,7 +25,6 @@ required=gcc mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/t/silent3.sh b/t/silent3.sh index fe3f28b58..fe27ae40b 100755 --- a/t/silent3.sh +++ b/t/silent3.sh @@ -24,7 +24,6 @@ required='cc libtoolize' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_AR diff --git a/t/silent4.sh b/t/silent4.sh index 10afe75ab..88049f16f 100755 --- a/t/silent4.sh +++ b/t/silent4.sh @@ -25,7 +25,6 @@ required="libtoolize gcc" mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_AR diff --git a/t/silent6.sh b/t/silent6.sh index 3593adf5d..a4b0f69f0 100755 --- a/t/silent6.sh +++ b/t/silent6.sh @@ -19,7 +19,6 @@ . ./defs || exit 1 cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT EOF @@ -31,6 +30,7 @@ echo SUBDIRS = sub > Makefile.am mkdir sub cat > sub/Makefile.am <<'EOF' +AUTOMAKE_OPTIONS = -Wno-portability-recursive my_verbose = $(my_verbose_$(V)) my_verbose_ = $(my_verbose_$(AM_DEFAULT_VERBOSITY)) my_verbose_0 = @echo " XGEN $@"; diff --git a/t/silent7.sh b/t/silent7.sh index 898a4423b..5e5472e12 100755 --- a/t/silent7.sh +++ b/t/silent7.sh @@ -15,13 +15,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check user extensibility of silent-rules mode. +# Aslo check that silent rules are disabled by default. . ./defs || exit 1 -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF +echo AC_OUTPUT >> configure.ac cat > Makefile.am <<'EOF' all-local: foo @@ -41,7 +39,9 @@ $ACLOCAL $AUTOMAKE --add-missing $AUTOCONF -./configure --disable-silent-rules +# Silent rules are disabled by default, since we haven't called +# "AM_SILENT_RULES([yes])" explicitly. +./configure $MAKE >stdout || { cat stdout; exit 1; } cat stdout grep 'GEN ' stdout && exit 1 @@ -85,8 +85,4 @@ grep 'GEN ' stdout && exit 1 grep 'cp ' stdout grep 'echo ' stdout -# Ensure that setting 'silent-rules' in a Makefile.am produces an error. -echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am -AUTOMAKE_fails --force - : diff --git a/t/silent8.sh b/t/silent8.sh index 76bf62c80..5d7b135d6 100755 --- a/t/silent8.sh +++ b/t/silent8.sh @@ -16,13 +16,10 @@ # Check texinfo rules in silent-rules mode. -required='makeinfo-html tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' . ./defs || exit 1 -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF +echo AC_OUTPUT >> configure.ac cat > Makefile.am <<'EOF' info_TEXINFOS = foo.texi diff --git a/t/silent9.sh b/t/silent9.sh index a8aa393f4..c2868b500 100755 --- a/t/silent9.sh +++ b/t/silent9.sh @@ -24,7 +24,6 @@ required='cc libtoolize' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/t/silentcxx-gcc.sh b/t/silentcxx-gcc.sh index 462afd7a3..903378c64 100755 --- a/t/silentcxx-gcc.sh +++ b/t/silentcxx-gcc.sh @@ -24,7 +24,6 @@ required=g++ mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_CXX AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/silentcxx.sh b/t/silentcxx.sh index 11f834d60..a3c375a22 100755 --- a/t/silentcxx.sh +++ b/t/silentcxx.sh @@ -25,7 +25,6 @@ required=c++ mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_CXX AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/silentf77.sh b/t/silentf77.sh index a37a53fc4..a50c69eaa 100755 --- a/t/silentf77.sh +++ b/t/silentf77.sh @@ -23,7 +23,6 @@ required=fortran77 mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_F77 AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/silentf90.sh b/t/silentf90.sh index 7f6f4bab8..78bbce9ff 100755 --- a/t/silentf90.sh +++ b/t/silentf90.sh @@ -23,7 +23,6 @@ required=fortran mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_FC AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/stamph2.sh b/t/stamph2.sh index c6663914b..e2ccbdaeb 100755 --- a/t/stamph2.sh +++ b/t/stamph2.sh @@ -18,10 +18,9 @@ . ./defs || exit 1 cat >> configure.ac << END -AM_CONFIG_HEADER([1.h - 2.h:config.hin - 3.h:sdir1/config1.hin]) -# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms. +AC_CONFIG_HEADERS([1.h + 2.h:config.hin + 3.h:sdir1/config1.hin]) AC_CONFIG_HEADERS([sdir1/4.h sdir1/5.h:config.hin sdir1/6.h:sdir1/config1.hin diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh index f874ff853..c2f0fa3f4 100755 --- a/t/tap-doc2.sh +++ b/t/tap-doc2.sh @@ -31,7 +31,7 @@ END cat > configure.ac <<'END' AC_INIT([GNU Try Tap], [1.0], [bug-automake@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([foreign parallel-tests -Wall -Werror]) +AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AC_CONFIG_FILES([Makefile]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) AC_PROG_AWK diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh index 2208a04d4..ede722794 100755 --- a/t/test-driver-is-distributed.sh +++ b/t/test-driver-is-distributed.sh @@ -23,31 +23,25 @@ am_create_testdir=empty ocwd=$(pwd) || fatal_ "getting current working directory" -do_check () -{ - whereopts=$1 auxdir=$2 - case $#,$whereopts in - 2,ac) ac_opts=parallel-tests am_code= ;; - 2,am) am_opts=parallel-tests ac_code= ;; - *) fatal_ "do_check: bad usage";; - esac - mkdir $whereopts - cd $whereopts +for i in 1 2; do + mkdir D$i + cd D$i + if test $i -eq 1; then + auxdir=. + test_driver=test-driver + else + auxdir=build-aux + test_driver=$auxdir/test-driver + mkdir $auxdir + fi mkdir tests unindent > configure.ac << END AC_INIT([$me], [1.0]) AC_CONFIG_AUX_DIR([$auxdir]) - AM_INIT_AUTOMAKE([$ac_opts]) + AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile tests/Makefile]) AC_OUTPUT END - if test $auxdir = .; then - test_driver=test-driver - else - mkdir $auxdir - test_driver=$auxdir/test-driver - fi - # No 'AUTOMAKE_OPTIONS' in here -- purposely. unindent > Makefile.am << END SUBDIRS = tests check-local: test-top @@ -57,7 +51,6 @@ END .PHONY: test-top END unindent > tests/Makefile.am << END - AUTOMAKE_OPTIONS = $am_opts check-local: test-sub test-sub: echo ' ' \$(DIST_COMMON) ' ' | grep '[ /]$test_driver ' @@ -84,10 +77,7 @@ END $AUTOMAKE diff Makefile.in Makefile.sav diff tests/Makefile.in tests/Makefile.sav - : -} - -do_check ac . -do_check am build-aux + cd "$ocwd" || fatal_ "cannot chdir back to '$ocwd'" +done : diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh index 74bb6ffa5..54ecfb57b 100755 --- a/t/test-metadata-global-log.sh +++ b/t/test-metadata-global-log.sh @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Custom test drivers and parallel-tests harness: check the documented +# Custom test drivers and parallel test harness: check the documented # semantics for deciding when the content of a test log file should be # copied in the global test-suite.log file. Currently, this is done # with the use of the reStructuredText field ':copy-in-global-log:' in diff --git a/t/tests-environment-backcompat.sh b/t/tests-environment-backcompat.sh index a5d888d4d..a82f2972f 100755 --- a/t/tests-environment-backcompat.sh +++ b/t/tests-environment-backcompat.sh @@ -16,7 +16,7 @@ # With old serial testsuite driver, TESTS_ENVIRONMENT can be used to # define the "test runner", i.e. the program that the test scripts must -# be run by (with the parallel-tests driver one should use LOG_COMPILER +# be run by (with the parallel test harness one should use LOG_COMPILER # for this). The behaviour tested here is also documented in the manual. am_serial_tests=yes diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh index 3de21b488..3dc1a2928 100755 --- a/t/txinfo-no-clutter.sh +++ b/t/txinfo-no-clutter.sh @@ -17,7 +17,7 @@ # The pdf, ps and dvi targets shouldn't let clutter in the build directory. # Related to automake bug#11146. -required='makeinfo tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' . ./defs || exit 1 mkdir sub @@ -93,7 +93,8 @@ for fmt in info pdf ps dvi html all; do $MAKE $fmt ls -l . sub # For debugging. ls -d foo* baz* sub/bar* > lst - $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info)$' lst && exit 1 + $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info|t2[dp])$' \ + lst && exit 1 $MAKE clean done diff --git a/t/txinfo13.sh b/t/txinfo13.sh index 6c06942e4..2f9938bc0 100755 --- a/t/txinfo13.sh +++ b/t/txinfo13.sh @@ -18,7 +18,7 @@ # Also make sure we do not distribute too much foo.info* files (Report # from Vincent Lefevre). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/txinfo21.sh b/t/txinfo21.sh index 9936c0e66..5ad12544c 100755 --- a/t/txinfo21.sh +++ b/t/txinfo21.sh @@ -17,7 +17,7 @@ # Test support for building HTML documentation, and the many # install-DOC flavors. -required='makeinfo-html tex texi2dvi' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >>configure.ac <<\EOF diff --git a/t/txinfo23.sh b/t/txinfo23.sh index 02b2ca175..ebf62b035 100755 --- a/t/txinfo23.sh +++ b/t/txinfo23.sh @@ -19,7 +19,7 @@ # (Similar to txinfo13.test, plus DISTCLEANFILES). # (See also txinfo24.test and txinfo25.test). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >> configure.ac << 'END' diff --git a/t/txinfo24.sh b/t/txinfo24.sh index e7bc9642a..c613bd693 100755 --- a/t/txinfo24.sh +++ b/t/txinfo24.sh @@ -18,7 +18,7 @@ # (Similar to txinfo16.test, plus CLEANFILES). # (See also txinfo23.test and txinfo25.test). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >> configure.ac << 'END' diff --git a/t/txinfo25.sh b/t/txinfo25.sh index 15f554494..46dfc5060 100755 --- a/t/txinfo25.sh +++ b/t/txinfo25.sh @@ -20,7 +20,7 @@ # (Similar to txinfo16.test, plus CLEANFILES). # (See also txinfo23.test and txinfo24.test). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >> configure.ac << 'END' diff --git a/t/txinfo28.sh b/t/txinfo28.sh index e6613b40e..9bcf6e2c4 100755 --- a/t/txinfo28.sh +++ b/t/txinfo28.sh @@ -19,7 +19,7 @@ # references. # Report from Ralf Corsepius. -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 # This setting, when honored by GNU ls, used to cause an infinite loop diff --git a/t/txinfo30.sh b/t/txinfo30.sh deleted file mode 100755 index db8f708f2..000000000 --- a/t/txinfo30.sh +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh -# Copyright (C) 2005-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/>. - -# Make sure 'missing texinfo' does not create empty files. -# Report from Bob Proulx. - -. ./defs || exit 1 - -echo info_TEXINFOS = bar.texi >Makefile.am -echo grepme >bar.info -$sleep -cat >bar.texi <<EOF -@setfilename bar.info -EOF - -echo AC_OUTPUT >>configure.ac - -cat >makeinfo <<\EOF -#!/bin/sh -# This script -# 1. fails so 'missing' can take over -# 2. does not understand '--version' so 'missing' thinks 'makeinfo' isn't -# installed -exec false -EOF - -chmod +x makeinfo - -PATH=$(pwd)$PATH_SEPARATOR$PATH -export PATH - -# Otherwise configure might pick up a working makeinfo from the -# environment. Seen in automake bug#10866. -unset MAKEINFO || : - -$ACLOCAL -$AUTOCONF -$AUTOMAKE --add-missing - -./configure -$MAKE -grep grepme bar.info -test -f bar.info - -# We should not create a missing bar.info. -rm -f bar.info -$MAKE && exit 1 -test ! -f bar.info - -: diff --git a/t/txinfo33.sh b/t/txinfo33.sh index 28c9f1a18..b457cb017 100755 --- a/t/txinfo33.sh +++ b/t/txinfo33.sh @@ -17,7 +17,7 @@ # DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'. # Similar to txinfo25.test. -required='makeinfo tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' . ./defs || exit 1 mkdir sub diff --git a/t/txinfo5.sh b/t/txinfo5.sh deleted file mode 100755 index 0eb02689c..000000000 --- a/t/txinfo5.sh +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998-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 to make sure that texinfo.tex is not required by --cygnus. -# Also check that TEXINFOS + cygnus work without requiring the -# '-Wno-override' option. -# See also sister test txinfo5b.test. -# Report from Ian Taylor. - -. ./defs || exit 1 - -cat >> configure.ac << 'END' -AM_MAINTAINER_MODE -END - -cat > Makefile.am << 'END' -info_TEXINFOS = ian.texi -END - -echo '@setfilename ian.info' > ian.texi - -$ACLOCAL -$AUTOMAKE --cygnus -Wno-obsolete - -: diff --git a/t/txinfo5b.sh b/t/txinfo5b.sh deleted file mode 100755 index c41a75f6b..000000000 --- a/t/txinfo5b.sh +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998-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 to make sure that texinfo.tex is not required by --cygnus. -# See also sister test txinfo5.test. -# Report from Ian Taylor. - -. ./defs || exit 1 - -cat >> configure.ac << 'END' -AM_MAINTAINER_MODE -END - -cat > Makefile.am << 'END' -# Disable 'override' warnings to work around an unrelated -# texi+cygnus bug. -# Disable obsolete warnings because the 'cygnus' mode is now deprecated. -AUTOMAKE_OPTIONS = -Wno-override -Wno-obsolete -info_TEXINFOS = ian.texi -END - -echo '@setfilename ian.info' > ian.texi - -$ACLOCAL -$AUTOMAKE --cygnus -$AUTOMAKE -a --cygnus -test ! -f texinfo.tex - -: diff --git a/t/version.sh b/t/version.sh deleted file mode 100755 index acfbbe6eb..000000000 --- a/t/version.sh +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh -# Copyright (C) 1996-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 to make sure [...] is ok in version number. Report from Jim -# Meyering. - -. ./defs || exit 1 - -cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE([sh-utils], [1.12o]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -: > Makefile.am - -# Files required by Gnits. -: > INSTALL -: > NEWS -: > README -: > COPYING -: > AUTHORS -: > ChangeLog -: > THANKS - -$ACLOCAL -$AUTOMAKE --gnits -Wno-obsolete diff --git a/t/version2.sh b/t/version2.sh deleted file mode 100755 index b690dc9a2..000000000 --- a/t/version2.sh +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh -# Copyright (C) 1997-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 to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in -# version. From Joel Weber. - -. ./defs || exit 1 - -cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE([sh-utils], [1.12o], [no]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -: > Makefile.am - -# Files required by Gnits. -: > INSTALL -: > NEWS -: > README -: > COPYING -: > AUTHORS -: > ChangeLog -: > THANKS - -$ACLOCAL -$AUTOMAKE --gnits -Wno-obsolete diff --git a/t/vtexi4.sh b/t/vtexi4.sh index 864818f67..8e77e86c2 100755 --- a/t/vtexi4.sh +++ b/t/vtexi4.sh @@ -21,7 +21,7 @@ # for more vers*.texi files, and does not require makeinfo, tex and # texi2dvi. -required='makeinfo tex texi2dvi-o grep-nonprint' +required='makeinfo tex texi2dvi grep-nonprint' . ./defs || exit 1 test $(LC_ALL=C date '+%u') -gt 0 && test $(LC_ALL=C date '+%u') -lt 8 \ |