From: Stefano Lattarini Date: Thu, 3 Nov 2011 14:39:02 +0000 (+0100) Subject: Merge branch 'master' into testsuite-work X-Git-Tag: ng-0.5a~89^2~19^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5012480bf2586caf6dc642a1883a39991beb0804;p=thirdparty%2Fautomake.git Merge branch 'master' into testsuite-work Commits merged from master: - tests: various minor tweakings, mostly related to AM_PROG_AR - maint-mode: fix botched configure messages - fix: regenerate Makefiles - tests: few improvements to some `ar-lib' related tests - info: allow user to inhibit creation/update of '${infodir}/dir' - warnings: new 'extra-portability' category, for AM_PROG_AR - ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script Extra testsuite adjustments: * tests/instspc.tap: Adjust to new portability requirements due to the new AM_PROG_AR macro. * tests/lex-lib.test: Likewise. * tests/extra-portability2.test: Use `$am_original_AUTOMAKE' instead of the obsolete `$original_AUTOMAKE'. * tests/list-of-tests.mk: Update. --- 5012480bf2586caf6dc642a1883a39991beb0804 diff --cc ChangeLog index adba25e72,7363e1a35..2f5407d2a --- a/ChangeLog +++ b/ChangeLog @@@ -1,17 -1,187 +1,212 @@@ ++2011-11-03 Stefano Lattarini ++ ++ Merge branch 'master' into testsuite-work ++ ++ * tests/instspc.tap: Adjust to new portability requirements ++ due to the new AM_PROG_AR macro. ++ * tests/lex-lib.test: Likewise. ++ * tests/extra-portability2.test: Use `$am_original_AUTOMAKE' ++ instead of the obsolete `$original_AUTOMAKE'. ++ * tests/list-of-tests.mk: Update. ++ + 2011-11-03 Stefano Lattarini + + tests: various minor tweakings, mostly related to AM_PROG_AR + * tests/alloca.test: Adjust to new portability requirements due + to the new AM_PROG_AR macro. + * tests/discover.test: Likewise. + * tests/libobj3.test: Likewise. + * tests/pluseq7.test: Likewise. Also, make grepping of automake + expected error message stricter. + * tests/stdlib.test: Likewise, and extend the test a bit. + * tests/parse.test (configure.in): Remove redundant call to + AC_PROG_RANLIB. + * tests/library2.test: Adjust to new portability requirements + due to the new AM_PROG_AR macro. Also ... + (configure.in): ... add call to AC_PROG_CC, to ensure automake + really fails for the expected reason. + + 2011-11-03 Stefano Lattarini + + Merge branch 'msvc' into master + + * tests/instspc-tests.sh: Adjust to new portability requirements + due to the new AM_PROG_AR macro. + * tests/libobj-basic.test: Likewise. + * tests/libobj2.test: Likewise. + * tests/libobj15a.test: Likewise. + * tests/libobj15b.test: Likewise. + * tests/libobj15c.test: Likewise. + * tests/libobj16a.test: Likewise. + * tests/libobj16b.test: Likewise. + * tests/libobj17.test: Likewise. + * tests/libobj18.test: Likewise. + * tests/libobj19.test: Likewise. + * tests/libobj20a.test: Likewise. + * tests/libobj20b.test: Likewise. + * tests/libobj20c.test: Likewise. + * tests/canon6.test: Likewise. + * tests/canon6.test: Likewise. + * tests/canon7.tests: Likewise. + * tests/extra9.test: Likewise. + * tests/extradep.test: Likewise. + * tests/extradep2.test: Likewise. + * tests/posixsubst-ldadd.test: Likewise. + * tests/posixsubst-libraries.test: Likewise. + * tests/posixsubst-ltlibraries.test: Likewise. + * tests/python-virtualenv.test: Likewise. + * tests/vartypos.test: Likewise. + * tests/vartypo2.test: Likewise. + * tests/suffix.test: Update to take into account previous + master-only changes. + * tests/suffix2.test: Likewise. + * tests/libobj7.test: Call automake with the `--add-missing' + option, instead of creating a dummy `ar-lib' file, since this + test now also runs "./configure" and "make". + * tests/suffix5.test: Copy the real `ar-lib' script file, + instead of creating a dummy one, since this test now also + runs "./configure" and "make". + * tests/extra-portability2.test: Fix this test not to rely + on the older, faulty semantics of "strictness specification + always reset warning level", which has been fixed in commit + v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547). + Since we are at it, throw inf few other minor unrelated + improvements. + * tests/extra-portability.test: Explicitly pass `-Wall' to + automake calls, for clarity. + + 2011-10-21 Peter Rosin + + warnings: new 'extra-portability' category, for AM_PROG_AR + * lib/Automake/ChannelDefs.pm: Register new extra-portability + warning channel. + (switch_warning): Turn off extra-portability if portability is + turned off, and turn on portability if extra-portability is + turned on. + (set_strictness): Silence extra-portability for --gnits, --gnu + and --foreign. + * tests/extra-portability2.test: New test, checking that the + extra-portability channel is silenced by --gnits, --gnu and + --foreign. + * doc/automake.texi (Invoking Automake): Document the new warning + category and its interaction with the portability category. + * tests/extra-portability.test: New test, checking the interaction + between the portability and extra-portability warning categories. + * automake.in (handle_libraries, handle_ltlibraries): Move the + AM_PROG_AR warnings to the new extra-portability channel. + * tests/ar2.test: Adjust to the new warning channel. + * tests/pr300-lib.test: Likewise. + * tests/pr300-ltlib.test: Likewise. + * tests/pr307.test: Likewise. + * tests/pr401.test: Likewise. + * tests/pr401b.test: Likewise. + * tests/pr401c.test: Likewise. + * tests/pr72.test: Likewise. + * NEWS: Likewise. + * tests/Makefile.am (TESTS): Update. + + 2011-10-21 Peter Rosin + Ralf Wildenhues + Stefano Lattarini + + Add new 'AM_PROG_AR' macro, triggering the 'ar-lib' script. + * m4/ar-lib.m4: New macro AM_PROG_AR, which locates an + archiver and triggers the auxiliary 'ar-lib' script if needed. + * m4/Makefile.am (dist_m4data_DATA): Update. + * automake.in ($seen_ar): New variable. + (scan_autoconf_traces): Set it. + (handle_libraries, handle_ltlibraries): Require AM_PROG_AR for + portability. + * doc/automake.texi (Public Macros): Mention the new + 'AM_PROG_AR' macro. + (Subpackages): Add AM_PROG_AR to the example. + (A Library): Adjust recommendations for AR given the new + AM_PROG_AR macro. + * All relevant tests: Adjust to new portability requirements due + to the new AM_PROG_AR macro. + * tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers + install of ar-lib. + * tests/ar-lib3.test: New test, checking that lib_LIBRARIES + requires AM_PROG_AR. + * tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES + requires AM_PROG_AR. + * tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers + use of ar-lib when the archiver is Microsoft lib. + * tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers + use of ar-lib when the archiver is a faked lib. + * tests/ar-lib6a.test: New test, checking the ordering of + AM_PROG_AR and LT_INIT. + * tests/ar-lib6b.test: New test, checking the ordering of + AM_PROG_AR and AC_PROG_LIBTOOL. + * tests/ar-lib7.test: New test, checking that automake warns + if ar-lib is missing. + * tests/ar3.test: New test, checking that AR and ARFLAGS may + be overridden by the user even if AM_PROG_AR is used. + * tests/ar4.test: New test, checking that AM_PROG_AR bails out + if it cannot determine the archiver interface. + * tests/ar5.test: New test, checking that AM_PROG_AR runs its + optional argument if it cannot determine the archiver interface. + * tests/defs.in: New required entry 'lib'. + * tests/Makefile.am (TESTS): Update. + * NEWS: Update. + + 2011-11-03 Zack Weinberg (tiny change) + Stefano Lattarini + + maint-mode: fix botched configure messages + This change fixes automake bug#9890. + * m4/maintainer.m4 (AM_MAINTAINER_MODE): Fix the "checking ..." + configure message related to the enabling/disabling of maintainer + mode. + * tests/help-maintainer.test: Renamed ... + * tests/maintmode-configure-msg.test: ... to this, and extended + to cover the fixed bug. Also, since we are at it, make grepping + of configure help screens stricter, and throw in some few other + changes to reduce code duplication and enhance readability. + * tests/Makefile.am (TESTS): Update. + * THANKS: Update with Zack's new e-mail address. + Report and initial patch by Zack Weinberg, test cases added by + Stefano Lattarini. + + 2011-10-23 Stefano Lattarini + + info: allow user to inhibit creation/update of '${infodir}/dir' + With this change, we allow the user to request the install-info + rules not to update the `${infodir}/dir' file, by exporting the + environment variable `AM_UPDATE_INFO_DIR' to the value "no". + This is especially useful to distro packagers, and is a definite + improvement over our previous hack of looking whether the + `install-info' program was the Debian or GNU version -- hack + which had been silently broken with recent versions of debian + install-info BTW (probably since dpkg 1.15.4, 2009-09-06). + This change fixes automake bug#9773. See also Debian Bug#543992. + * lib/am/texinfos.am: Don't look anymore at the output of + `install-info --version' to decide whether to use it to update + the `${infodir}/dir' or not; instead, honour the environment + variable `AM_UPDATE_INFO_DIR'. + * tests/install-info-dir.test: New test. + * tests/Makefile.am (TESTS): Add it. + * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted + interferences from the environment. + * doc/automake.texi (Texinfo): Update. + * NEWS: Likewise. + * THANKS: Likewise. + Report by Jonathan Nieder. + +2011-10-25 Stefano Lattarini + + tests: remove redundant `set -e', and other minor improvements + * tests/dejagnu-absolute-builddir.test: Do not set the `errexit' + shell flag, as it is already set by `tests/defs'. + * tests/dejagnu-relative-srcdir.test: Likewise. + * tests/dejagnu-siteexp-append.test: Likewise. + * tests/dejagnu-siteexp-useredit.test: Likewise, and fix a typo + in comments. + * tests/dejagnu-siteexp-extend.test: Likewise, and prefer the + use of `$distdir' over hard-coded `$me-1.0'. Also ... + (write_check_for): ... use `unindent' when writing from an + here-doc, for better code indentation. + 2011-10-20 Stefano Lattarini deps: partially revert commit `v1.11-512-geeee551' diff --cc m4/Makefile.am index a6491cfe7,eebf04e27..d04ec9d33 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@@ -18,8 -18,12 +18,9 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -automake_acdir = $(datadir)/aclocal-$(APIVERSION) -system_acdir = $(datadir)/aclocal - dist_automake_ac_DATA = \ $(top_srcdir)/m4/amversion.m4 \ + ar-lib.m4 \ as.m4 \ auxdir.m4 \ ccstdc.m4 \ diff --cc m4/Makefile.in index de296dc8b,97654404c..0f1a0ad83 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@@ -209,8 -199,11 +209,9 @@@ target_alias = @target_alias top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -automake_acdir = $(datadir)/aclocal-$(APIVERSION) -system_acdir = $(datadir)/aclocal dist_automake_ac_DATA = \ $(top_srcdir)/m4/amversion.m4 \ + ar-lib.m4 \ as.m4 \ auxdir.m4 \ ccstdc.m4 \ diff --cc tests/Makefile.in index 5a34c995a,babba97f3..b260ad290 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -698,9 -752,10 +709,11 @@@ extra9.test extra10.test \ extra11.test \ extra12.test \ -extradep.test \ -extradep2.test \ +extra-programs-empty.test \ + extra-portability.test \ + extra-portability2.test \ +extradep.test \ +extradep2.test \ f90only.test \ flavor.test \ flibs.test \ @@@ -781,6 -837,8 +793,7 @@@ instman2.test instmany.test \ instmany-mans.test \ instmany-python.test \ -instspc-data.test \ -$(instspc_tests) \ ++install-info-dir.test \ interp.test \ interp2.test \ java.test \ diff --cc tests/canon7.test index 4a4d66ff4,c399cd5ac..48d1b8869 --- a/tests/canon7.test +++ b/tests/canon7.test @@@ -21,9 -21,9 +21,10 @@@ required='cc libtool libtoolize cat >> configure.in << 'END' AC_PROG_CC + AM_PROG_AR AC_PROG_RANLIB dnl: for static libraries AC_PROG_LIBTOOL dnl: for libtool libraries +AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) AC_OUTPUT END diff --cc tests/cond13.test index 190f1e689,83c65053a..a63ee63e2 --- a/tests/cond13.test +++ b/tests/cond13.test @@@ -22,9 -22,10 +22,10 @@@ cat >> configure.in << 'END' AC_PROG_CC AC_PROG_CXX + AM_PROG_AR AC_PROG_RANLIB -AM_CONDITIONAL(COND1, true) -AM_CONDITIONAL(COND2, true) +AM_CONDITIONAL([COND1], [true]) +AM_CONDITIONAL([COND2], [true]) END cat > Makefile.am << 'END' diff --cc tests/defs index e5f66a52a,1c9dd908b..74fe633a1 --- a/tests/defs +++ b/tests/defs @@@ -706,19 -408,24 +706,27 @@@ d java) # See the comments above about `javac' for why we use also `-help'. echo "$me: running java -version -help" - java -version -help || skip_ "java interpreter not found" + java -version -help || skip_all_ "Sun Java interpreter not found" ;; + lib) + AR=lib + export AR + # Attempting to create an empty archive will actually not + # create the archive, but lib will output its version. + echo "$me: running $AR -out:defstest.lib" + $AR -out:defstest.lib || skip_ "Microsoft \`lib' utility not available" + ;; makedepend) echo "$me: running makedepend -f-" - makedepend -f- || exit 77 + makedepend -f- \ + || skip_all_ "required program \`makedepend' not available" ;; makeinfo-html) - # Make sure makeinfo understands --html. + # Make sure we have makeinfo, and it understands `--html'. echo "$me: running makeinfo --html --version" - makeinfo --html --version || exit 77 + makeinfo --html --version \ + || skip_all_ "cannot find a makeinfo program that groks the" \ + "\`--html' option" ;; non-root) # Skip this test case if the user is root. diff --cc tests/extra-portability2.test index 000000000,9e7212a2d..cd8632b46 mode 000000,100755..100755 --- a/tests/extra-portability2.test +++ b/tests/extra-portability2.test @@@ -1,0 -1,52 +1,52 @@@ + #! /bin/sh + # Copyright (C) 2011 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 . + + # Make sure that extra-portability warnings are not enabled by --gnits, + # --gnu and --foreign. + + . ./defs || Exit 1 + + set -e + + # We want complete control over automake options. -AUTOMAKE=$original_AUTOMAKE ++AUTOMAKE=$am_original_AUTOMAKE + + cat >>configure.in <Makefile.am <. + +# Check that building from, or installing to, directories with shell +# metacharacters succeed. +# Original report from James Amundson about file names with spaces. +# Other characters added by Paul Eggert. + +. ./defs || Exit 99 + +# Usage: is_in_list ITEM [LIST...] +is_in_list () +{ + item=$1; shift; + case " $* " in + *[\ \ ]"$item"[\ \ ]*) return 0;; + *) return 1;; + esac +} + +# Helper subroutine for test data definition. +# Usage: define_problematic_string NAME STRING +define_problematic_string () +{ + tst=$1; shift + eval "instspc__$tst=\$1" \ + || fatal_ "define_problematic_string: bad argument: '$tst'" + shift + all_test_names_list="$all_test_names_list $tst" + # Some of the "problematic" characters cannot be used in the name of + # a build or install directory on a POSIX host. These lists should + # be empty, but are not due to limitations in Autoconf, Automake, Make, + # M4, or the shell. + if is_in_list fail-builddir "$@"; then + builddir_xfails="$builddir_xfails $tst" + fi + if is_in_list fail-destdir "$@"; then + destdir_xfails="$destdir_xfails $tst" + fi +} + +# Be sure to avoid interferences from the environment. +all_test_names_list='' +builddir_xfails='' +destdir_xfails='' + +expected_to_fail () +{ + case $1 in + build) is_in_list "$2" $builddir_xfails;; + dest) is_in_list "$2" $destdir_xfails;; + *) fatal_ "incorrect 'expected_to_fail' usage";; + esac +} + +# Helper subroutines for creation of input data files. +create_input_data () +{ + mkdir sub + + unindent >> configure.in << 'EOF' + AC_PROG_CC ++ AM_PROG_AR + AC_PROG_RANLIB + AC_OUTPUT +EOF + + : > sub/base.h + : > sub/nobase.h + : > sub/base.dat + : > sub/nobase.dat + : > sub/base.sh + : > sub/nobase.sh + + unindent > source.c << 'EOF' + int + main (int argc, char **argv) + { + return 0; + } +EOF + + unindent > Makefile.am << 'EOF' + foodir = $(prefix)/foo + fooexecdir = $(prefix)/foo + + foo_HEADERS = sub/base.h + nobase_foo_HEADERS = sub/nobase.h + + dist_foo_DATA = sub/base.dat + nobase_dist_foo_DATA = sub/nobase.dat + + dist_fooexec_SCRIPTS = sub/base.sh + nobase_dist_fooexec_SCRIPTS = sub/nobase.sh + + fooexec_PROGRAMS = sub/base + nobase_fooexec_PROGRAMS = sub/nobase + sub_base_SOURCES = source.c + sub_nobase_SOURCES = source.c + + fooexec_LIBRARIES = sub/libbase.a + nobase_fooexec_LIBRARIES = sub/libnobase.a + sub_libbase_a_SOURCES = source.c + sub_libnobase_a_SOURCES = source.c + + .PHONY: test-inst + test-inst: install + test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.h' + test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.h' + test -f '$(DESTDIR)/$(file)-prefix/foo/base.h' + test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.dat' + test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.dat' + test -f '$(DESTDIR)/$(file)-prefix/foo/base.dat' + test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.sh' + test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.sh' + test -f '$(DESTDIR)/$(file)-prefix/foo/base.sh' + test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase$(EXEEXT)' + test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase$(EXEEXT)' + test -f '$(DESTDIR)/$(file)-prefix/foo/base$(EXEEXT)' + test -f '$(DESTDIR)/$(file)-prefix/foo/sub/libnobase.a' + test ! -f '$(DESTDIR)/$(file)-prefix/foo/libnobase.a' + test -f '$(DESTDIR)/$(file)-prefix/foo/libbase.a' +EOF + - $ACLOCAL || framework_failure_ "aclocal failed" - $AUTOCONF || framework_failure_ "autoconf failed" - $AUTOMAKE || framework_failure_ "automake failed" ++ $ACLOCAL || framework_failure_ "aclocal failed" ++ $AUTOCONF || framework_failure_ "autoconf failed" ++ $AUTOMAKE -a || framework_failure_ "automake failed" +} + +# ================= # +# Test data begin # +# ----------------- # + +# Some control characters that are white space. +bs='' # back space +cr=' ' # carriage return +ff=' ' # form feed +ht=' ' # horizontal tab +lf=' +' # line feed (aka newline) + +# Hack to save typing and make code visually clearer. +def=define_problematic_string + +$def squote \' fail-builddir fail-destdir +$def dquote '"' fail-builddir fail-destdir +$def bquote '`' fail-builddir fail-destdir +$def sharp '#' fail-builddir fail-destdir +$def dollar '$' fail-builddir fail-destdir +$def bang '!' +$def bslash '\' fail-builddir +$def ampersand '&' fail-builddir +$def percent '%' +$def leftpar '(' +$def rightpar ')' +$def pipe '|' +$def caret '^' +$def tilde '~' +$def qmark '?' +$def star '*' +$def plus '+' +$def minus '-' +$def comma ',' +$def colon ':' +$def semicol ';' +$def equal '=' +$def less '<' +$def more '>' +$def at '@' +$def lqbrack '[' +$def rqbrack ']' +$def lcbrack '{' +$def rcbrack '}' +$def space ' ' +$def tab "$ht" +$def linefeed "$lf" fail-builddir fail-destdir +$def backspace "$bs" +$def formfeed "$ff" +$def carriageret "$cr" +$def quadrigraph0 '@&t@' fail-builddir +$def quadrigraph1 '@<:@' +$def quadrigraph2 '@:>@' +$def quadrigraph3 '@S|@' +$def quadrigraph4 '@%:@' +$def a_b 'a b' +$def a__b 'a b' +$def a_lf_b "a${lf}b" fail-builddir fail-destdir +$def dotdotdot '...' +$def dosdrive 'a:' +$def miscglob1 '?[a-z]*' +$def miscglob2 '.*?[0-9]' + +unset def + +# --------------- # +# Test data end # +# =============== # + +# Allow the user to select a subset of the tests. +if test $# -gt 0; then + test_names_list=$* + for test_name in $test_names_list; do + case " $all_test_names_list " in + *" $test_name "*);; + *) fatal_ "invalid user-specified test_name '$test_name'" + esac + done + # We need to determine the TAP plan adaptively. + n=`for t in $test_names_list; do echo $t; done | wc -l` + plan_ `expr $n '*' 2` # Two tests per "problematic string". + unset n +else + test_names_list=$all_test_names_list + # Prefer static TAP plan if possible, minimizes the chance of errors. + plan_ 94 +fi + +ocwd=`pwd` || fatal_ "cannot get current working directory" + +create_input_data + +for test_name in $test_names_list; do + + eval "test_string=\${instspc__$test_name}" \ + && test x"$test_string" != x \ + || fatal_ "invalid test name: '$test_name'" + + # Skip the next checks if this system doesn't support the required + # characters in file names. + + mkdir "./$test_string" || { + skip_ -r "mkdir failed" "$test_name in builddir" + skip_ -r "mkdir failed" "$test_name in destdir" + continue + } + + # Where are the "weird" characters going to be used, in $(builddir) + # or in $(DESTDIR)? They are always going to be used in $(prefix) + # though; should we maybe separate this into a dedicated check? + for where in build dest; do + + case $where in + build) + build=./$test_string + dest=$ocwd/dest-$test_name + ;; + dest) + build=build-$test_name + dest=$ocwd/$test_string + mkdir "$build" || fatal_ "cannot create '$build'" + ;; + *) + fatal_ "invalid where '$where'" + ;; + esac + + cd "$build" || fatal_ "cannot chdir into '$build'" + + # Some make implementations eliminate leading and trailing whitespace + # from macros passed on the command line, and some eliminate leading + # whitespace from macros set from environment variables, so prepend + # './' and use the latter here. + r=ok + ../configure --prefix "/$test_string-prefix" \ + && $MAKE all \ + && DESTDIR="$dest" file="./$test_string" $MAKE -e test-inst \ + || r='not ok' + + description="$test_name in ${where}dir" + if expected_to_fail "$where" "$test_name"; then + directive=TODO + reason="long-standing limitation" + else + directive= + reason= + fi + # Test case outcome is here. + result_ "$r" -D "$directive" -r "$reason" -- "$description" + + cd "$ocwd" || fatal_ "cannot chdir back to test directory" + + # Remove subdirectories for tests that have passed, to avoid ending up + # with a too big test directory. This is especially important since + # some tests in this tests are expected to fail, and this will cause + # the test directory not to be removed when the script terminates. + case $keep_testdirs,$r1 in + ,ok) rm_rf_ $depmode-$vpath.d;; + *) : For lesser shells with broken 'set -e';; + esac + + done # $instspc_action + +done # $test_name + +: diff --cc tests/lex-lib.test index 0cdc4b745,000000000..833966792 mode 100755,000000..100755 --- a/tests/lex-lib.test +++ b/tests/lex-lib.test @@@ -1,69 -1,0 +1,70 @@@ +#! /bin/sh +# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011 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 . + +# Check that we can provide a personal `yywrap' function in a custom +# library. +# See also test `lex-lib-external.test'. + +required='cc lex' +. ./defs || Exit 1 + +cat >> configure.in << 'END' +AC_PROG_CC ++AM_PROG_AR +AC_PROG_RANLIB +LEXLIB=libmylex.a +AC_PROG_LEX +AC_OUTPUT +END + +cat > Makefile.am << 'END' +bin_PROGRAMS = lexer +lexer_SOURCES = foo.l +lexer_LDADD = $(LEXLIB) +EXTRA_lexer_DEPENDENCIES = $(LEXLIB) +noinst_LIBRARIES = libmylex.a +libmylex_a_SOURCES = mu.c +END + +cat > mu.c << 'END' +int yywrap (void) +{ + return 1; +} +END + +cat > foo.l <<'END' +%% +"END" return EOF; +. +%% +int main (void) +{ + return 0; +} +END + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure +$MAKE +test -f foo.c +test -f libmylex.a + +: diff --cc tests/libobj16a.test index 5f5bfb7de,a1ae93b60..4a5709a94 --- a/tests/libobj16a.test +++ b/tests/libobj16a.test @@@ -23,8 -22,9 +23,9 @@@ required=c mv configure.in configure.proto cat >> configure.proto << 'END' AC_PROG_CC + AM_PROG_AR AC_PROG_RANLIB -%LIBOBJ-STUFF% # will be activated later +%LIBOBJ-STUFF% # Will be activated later. AC_OUTPUT END diff --cc tests/libtoo10.test index 0d999dce8,4f1a60e5b..f0f2e32f6 --- a/tests/libtoo10.test +++ b/tests/libtoo10.test @@@ -17,10 -17,10 +17,11 @@@ # Make sure .libs directories are removed for _PROGRAMS. # Report from Guillermo Ontañón. -required=libtoolize +required='cc libtoolize' . ./defs || Exit 1 + cat >> configure.in << 'END' + AM_PROG_AR AC_PROG_LIBTOOL AC_OUTPUT END diff --cc tests/list-of-tests.mk index d8473e368,000000000..e8d192ea7 mode 100644,000000..100644 --- a/tests/list-of-tests.mk +++ b/tests/list-of-tests.mk @@@ -1,1168 -1,0 +1,1182 @@@ +## Makefile fragment that holds the list of test scripts of the automake +## testsuite. This fragment is meant to be included by the Makefile.am, +## but also to be executed directly by make when bootstrapping automake. + +## Copyright (C) 2011 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 . + +# The order here is mostly alphabetical, with the deliberate exception +# that tests having a high runtime (especially TAP tests that run various +# checks sequentially) are listed early; this improved performance on +# concurrent testsuite runs. +handwritten_TESTS = \ +depmod.tap \ +instspc.tap \ +aclocal.test \ +aclocal3.test \ +aclocal4.test \ +aclocal5.test \ +aclocal6.test \ +aclocal7.test \ +aclocal8.test \ +aclocal9.test \ +acloca10.test \ +acloca11.test \ +acloca12.test \ +acloca13.test \ +acloca14.test \ +acloca15.test \ +acloca16.test \ +acloca17.test \ +acloca18.test \ +acloca19.test \ +acloca20.test \ +acloca21.test \ +acloca22.test \ +acloca23.test \ +aclocal-acdir.test \ +aclocal-print-acdir.test \ +aclocal-path.test \ +aclocal-path-install.test \ +aclocal-path-install-serial.test \ +aclocal-path-nonexistent.test \ +aclocal-path-precedence.test \ +ac-output-old.tap \ +acsilent.test \ +acsubst.test \ +acsubst2.test \ +add-missing.tap \ +all.test \ +all2.test \ +alloca.test \ +alloca2.test \ +alpha.test \ +alpha2.test \ +amhello-cflags.test \ +amhello-cross-compile.test \ +amhello-binpkg.test \ +amassign.test \ +ammissing.test \ +amopt.test \ +amopts-location.test \ +amopts-variable-expansion.test \ +amsubst.test \ +ansi2knr-no-more.test \ +ar-lib.test \ ++ar-lib2.test \ ++ar-lib3.test \ ++ar-lib4.test \ ++ar-lib5a.test \ ++ar-lib5b.test \ ++ar-lib6a.test \ ++ar-lib6b.test \ ++ar-lib7.test \ +ar.test \ +ar2.test \ ++ar3.test \ ++ar4.test \ ++ar5.test \ +asm.test \ +asm2.test \ +asm3.test \ +autodist.test \ +autodist-subdir.test \ +autodist-acconfig.test \ +autodist-acconfig-no-subdir.test \ +autodist-aclocal-m4.test \ +autodist-config-headers.test \ +autodist-configure-no-subdir.test \ +autodist-no-duplicate.test \ +autodist-stamp-vti.test \ +autohdr.test \ +autohdr2.test \ +autohdr3.test \ +autohdr4.test \ +autohdrdry.test \ +automake-cmdline.tap \ +auxdir.test \ +auxdir6.test \ +auxdir7.test \ +auxdir8.test \ +auxdir-autodetect.test \ +auxdir-computed.tap \ +auxdir-misplaced.test \ +auxdir-nonexistent.test \ +auxdir-unportable.tap \ +backcompat.test \ +backcompat2.test \ +backcompat3.test \ +backcompat4.test \ +backcompat5.test \ +backcompat6.test \ +backsl.test \ +backsl2.test \ +backsl3.test \ +backsl4.test \ +badline.test \ +badopt.test \ +badprog.test \ +block.test \ +bsource.test \ +candist.test \ +canon.test \ +canon2.test \ +canon3.test \ +canon4.test \ +canon5.test \ +canon6.test \ +canon7.test \ +canon8.test \ +canon-name.test \ +ccnoco.test \ +ccnoco2.test \ +ccnoco3.test \ +check.test \ +check2.test \ +check3.test \ +check4.test \ +check5.test \ +check6.test \ +check7.test \ +check8.test \ +check10.test \ +check11.test \ +check12.test \ +check-subst.test \ +check-subst-prog.test \ +check-exported-srcdir.test \ +check-fd-redirect.test \ +check-tests-in-builddir.test \ +check-no-test-driver.test \ +check-concurrency-bug9245.test \ +checkall.test \ +clean.test \ +clean2.test \ +colneq.test \ +colneq2.test \ +colneq3.test \ +colon.test \ +colon2.test \ +colon3.test \ +colon4.test \ +colon5.test \ +colon6.test \ +colon7.test \ +color.test \ +color2.test \ +comment.test \ +comment2.test \ +comment3.test \ +comment4.test \ +comment5.test \ +comment6.test \ +comment7.test \ +comment8.test \ +comment9.test \ +commen10.test \ +commen11.test \ +comments-in-var-def.test \ +compile.test \ +compile2.test \ +compile3.test \ +compile4.test \ +compile5.test \ +compile6.test \ +compile_f90_c_cxx.test \ +compile_f_c_cxx.test \ +cond-basic.test \ +cond.test \ +cond2.test \ +cond3.test \ +cond4.test \ +cond5.test \ +cond6.test \ +cond7.test \ +cond8.test \ +cond9.test \ +cond10.test \ +cond11.test \ +cond13.test \ +cond14.test \ +cond15.test \ +cond16.test \ +cond17.test \ +cond18.test \ +cond19.test \ +cond20.test \ +cond21.test \ +cond22.test \ +cond23.test \ +cond24.test \ +cond25.test \ +cond26.test \ +cond27.test \ +cond28.test \ +cond29.test \ +cond30.test \ +cond31.test \ +cond32.test \ +cond33.test \ +cond34.test \ +cond35.test \ +cond36.test \ +cond37.test \ +cond38.test \ +cond39.test \ +cond40.test \ +cond41.test \ +cond42.test \ +cond43.test \ +cond44.test \ +cond45.test \ +cond46.test \ +condd.test \ +condhook.test \ +condhook2.test \ +condinc.test \ +condinc2.test \ +condlib.test \ +condman2.test \ +condman3.test \ +configure.test \ +confdeps.test \ +conff.test \ +conff2.test \ +confh.test \ +confh4.test \ +confh5.test \ +confh6.test \ +confh7.test \ +confh8.test \ +confincl.test \ +conflnk.test \ +conflnk2.test \ +conflnk3.test \ +conflnk4.test \ +confsub.test \ +confvar.test \ +confvar2.test \ +copy.test \ +cscope.test \ +cscope2.test \ +cscope3.test \ +cxx.test \ +cxx2.test \ +cxxcpp.test \ +cxxlibobj.test \ +cxxlink.test \ +cxxnoc.test \ +cxxo.test \ +cygnus-check-without-all.test \ +cygnus-dependency-tracking.test \ +cygnus-imply-foreign.test \ +cygnus-no-dist.test \ +cygnus-no-installinfo.test \ +cygnus-requires-maintainer-mode.test \ +cygwin32.test \ +dash.test \ +defun.test \ +defun2.test \ +dejagnu.test \ +dejagnu2.test \ +dejagnu3.test \ +dejagnu4.test \ +dejagnu5.test \ +dejagnu6.test \ +dejagnu7.test \ +dejagnu-absolute-builddir.test \ +dejagnu-relative-srcdir.test \ +dejagnu-siteexp-append.test \ +dejagnu-siteexp-extend.test \ +dejagnu-siteexp-useredit.test \ +depacl2.test \ +depcomp.test \ +depcomp2.test \ +depcomp3.test \ +depcomp4.test \ +depcomp5.test \ +depcomp6.test \ +depcomp7.test \ +depcomp8a.test \ +depcomp8b.test \ +depdist.test \ +depend.test \ +depend2.test \ +depend3.test \ +depend4.test \ +depend5.test \ +depend6.test \ +deprecated-acinit.test \ +destdir.test \ +dirlist.test \ +dirlist2.test \ +dirlist-abspath.test \ +discover.test \ +dist-auxdir-many-subdirs.test \ +dist-auxfile-2.test \ +dist-auxfile.test \ +dist-included-parent-dir.test \ +dist-readonly.test \ +dist-repeated.test \ +distcleancheck.test \ +distcom2.test \ +distcom3.test \ +distcom4.test \ +distcom5.test \ +distcom-subdir.test \ +distdir.test \ +distlinks.test \ +distlinksbrk.test \ +distname.test \ +distcheck-configure-flags.test \ +distcheck-configure-flags-am.test \ +distcheck-configure-flags-subpkg.test \ +distcheck-hook.test \ +distcheck-hook2.test \ +distcheck-missing-m4.test \ +distcheck-outdated-m4.test \ +distcheck-override-infodir.test \ +distcheck-pr9579.test \ +dmalloc.test \ +doc-parsing-buglets-colneq-subst.test \ +doc-parsing-buglets-tabs.test \ +dollar.test \ +dollarvar.test \ +dollarvar2.test \ +double.test \ +dup2.test \ +else.test \ +empty.test \ +empty2.test \ +empty3.test \ +empty4.test \ +exdir.test \ +exdir2.test \ +exdir3.test \ +exeext.test \ +exeext2.test \ +exeext3.test \ +exeext4.test \ +exsource.test \ +ext.test \ +ext2.test \ +ext3.test \ +extra.test \ +extra2.test \ +extra3.test \ +extra4.test \ +extra5.test \ +extra6.test \ +extra7.test \ +extra8.test \ +extra9.test \ +extra10.test \ +extra11.test \ +extra12.test \ +extra-programs-empty.test \ ++extra-portability.test \ ++extra-portability2.test \ +extradep.test \ +extradep2.test \ +f90only.test \ +flavor.test \ +flibs.test \ +fn99.test \ +fn99subdir.test \ +fnoc.test \ +fo.test \ +forcemiss.test \ +forcemiss2.test \ +fort1.test \ +fort2.test \ +fort4.test \ +fort5.test \ +fonly.test \ +fortdep.test \ +gcj.test \ +gcj2.test \ +gcj3.test \ +gcj4.test \ +gcj5.test \ +gcj6.test \ +getopt.test \ +gettext.test \ +gettext2.test \ +gettext3.test \ +gnumake.test \ +gnuwarn.test \ +gnuwarn2.test \ +gnits.test \ +gnits2.test \ +gnits3.test \ +hdr-vars-defined-once.test \ +header.test \ +help.test \ +help2.test \ +help3.test \ +help4.test \ +help-depend.test \ +help-depend2.test \ +help-dmalloc.test \ +help-init.test \ +help-lispdir.test \ - help-maintainer.test \ +help-multilib.test \ +help-python.test \ +help-regex.test \ +help-silent.test \ +help-upc.test \ +hfs.test \ +implicit.test \ +info.test \ +init.test \ +init2.test \ +insh2.test \ +install2.test \ +installdir.test \ +instsh.test \ +instsh2.test \ +instsh3.test \ +instdat.test \ +instdat2.test \ +instdir.test \ +instdir2.test \ +instdir-java.test \ +instdir-lisp.test \ +instdir-ltlib.test \ +instdir-prog.test \ +instdir-python.test \ +instdir-texi.test \ +instexec.test \ +instfail.test \ +instfail-info.test \ +instfail-java.test \ +instfail-libtool.test \ +insthook.test \ +instman.test \ +instman2.test \ +instmany.test \ +instmany-mans.test \ +instmany-python.test \ ++install-info-dir.test \ +interp.test \ +interp2.test \ +java.test \ +java2.test \ +java3.test \ +javadir-undefined.test \ +javaflags.test \ +java-check.test \ +java-clean.test \ +java-compile-install.test \ +java-compile-run-flat.test \ +java-compile-run-nested.test \ +java-empty-classpath.test \ +javaprim.test \ +javasubst.test \ +java-extra.test \ +java-mix.test \ +java-no-duplicate.test \ +java-nobase.test \ +java-noinst.test \ +java-rebuild.test \ +java-sources.test \ +java-uninstall.test \ +ldadd.test \ +ldflags.test \ +lex.test \ +lex2.test \ +lex3.test \ +lex4.test \ +lex5.test \ +lexcpp.test \ +lexvpath.test \ +lex-subobj-nodep.test \ +lex-lib.test \ +lex-lib-external.test \ +lex-libobj.test \ +lex-noyywrap.test \ +lflags.test \ +lflags2.test \ +libexec.test \ +libobj-basic.test \ +libobj2.test \ +libobj3.test \ +libobj4.test \ +libobj5.test \ +libobj7.test \ +libobj10.test \ +libobj12.test \ +libobj13.test \ +libobj14.test \ +libobj15a.test \ +libobj15b.test \ +libobj15c.test \ +libobj16a.test \ +libobj16b.test \ +libobj17.test \ +libobj18.test \ +libobj19.test \ +libobj20a.test \ +libobj20b.test \ +libobj20c.test \ +library.test \ +library2.test \ +library3.test \ +libtool.test \ +libtool2.test \ +libtool3.test \ +libtool4.test \ +libtool5.test \ +libtool6.test \ +libtool7.test \ +libtool8.test \ +libtool9.test \ +libtoo10.test \ +libtoo11.test \ +license.test \ +license2.test \ +link_c_cxx.test \ +link_dist.test \ +link_f90_only.test \ +link_fc.test \ +link_fccxx.test \ +link_fcxx.test \ +link_f_only.test \ +link_override.test \ +lisp2.test \ +lisp3.test \ +lisp4.test \ +lisp5.test \ +lisp6.test \ +lisp7.test \ +lisp8.test \ +lispdry.test \ +listval.test \ +location.test \ +longline.test \ +longlin2.test \ +ltcond.test \ +ltcond2.test \ +ltconv.test \ +ltdeps.test \ +ltinit.test \ +ltinstloc.test \ +ltlibobjs.test \ +ltlibsrc.test \ +ltorder.test \ +lzip.test \ +lzma.test \ +m4-inclusion.test \ +maintclean.test \ +maintclean-vpath.test \ ++maintmode-configure-msg.test \ +make.test \ +makej.test \ +makej2.test \ +maken.test \ +maken2.test \ +maken3.test \ +maken4.test \ +makevars.test \ +man.test \ +man2.test \ +man3.test \ +man4.test \ +man5.test \ +man6.test \ +man7.test \ +man8.test \ +mdate.test \ +mdate2.test \ +mdate3.test \ +mdate4.test \ +mdate5.test \ +mdate6.test \ +missing.test \ +missing2.test \ +missing3.test \ +missing4.test \ +missing5.test \ +missing6.test \ +missing-auxfile-stops-makefiles-creation.test \ +mkinstall.test \ +mkinst2.test \ +mkinst3.test \ +mmode.test \ +mmodely.test \ +multlib.test \ +no-extra-makefile-code.test \ +no-outdir-option.test \ +nobase.test \ +nobase-libtool.test \ +nobase-python.test \ +nobase-nodist.test \ +nodef.test \ +nodef2.test \ +nodep.test \ +nodep2.test \ +nodepcomp.test \ +nodist.test \ +nodist2.test \ +nodist3.test \ +nogzip.test \ +nogzip2.test \ +noinst.test \ +noinstdir.test \ +nolink.test \ +nostdinc.test \ +notrans.test \ +number.test \ +objc.test \ +objc2.test \ +obsolete.test \ +oldvars.test \ +order.test \ +output.test \ +output2.test \ +output3.test \ +output4.test \ +output5.test \ +output6.test \ +output7.test \ +output8.test \ +output9.test \ +output10.test \ +output11.test \ +output12.test \ +output13.test \ +output-order.test \ +override-conditional-1.test \ +override-conditional-2.test \ +override-html.test \ +override-suggest-local.test \ +parallel-am.test \ +parallel-am2.test \ +parallel-am3.test \ +parallel-tests.test \ +parallel-tests2.test \ +parallel-tests3.test \ +parallel-tests5.test \ +parallel-tests6.test \ +parallel-tests8.test \ +parallel-tests9.test \ +parallel-tests10.test \ +parallel-tests-exeext.test \ +parallel-tests-suffix.test \ +parallel-tests-suffix-prog.test \ +parallel-tests-log-compiler-1.test \ +parallel-tests-log-compiler-2.test \ +parallel-tests-dry-run.test \ +parallel-tests-fd-redirect.test \ +parallel-tests-extra-programs.test \ +parallel-tests-unreadable.test \ +parallel-tests-subdir.test \ +parallel-tests-interrupt.tap \ +parallel-tests-reset-term.test \ +parallel-tests-harderror.test \ +parallel-tests-log-override-1.test \ +parallel-tests-log-override-2.test \ +parallel-tests-log-override-recheck.test \ +parallel-tests-log-compiler-example.test \ +parallel-tests-cmdline-override.test \ +parallel-tests-fork-bomb.test \ +parallel-tests-empty-testlogs.test \ +parallel-tests-driver-install.test \ +parallel-tests-no-color-in-log.test \ +parallel-tests-no-spurious-summary.test \ +parallel-tests-exit-statuses.test \ +parallel-tests-console-output.test \ +parallel-tests-once.test \ +tests-environment.test \ +am-tests-environment.test \ +tests-environment-backcompat.test \ +testsuite-summary-color.test \ +testsuite-summary-count.test \ +testsuite-summary-count-many.test \ +testsuite-summary-reference-log.test \ +test-driver-acsubst.test \ +test-driver-cond.test \ +test-driver-custom-no-extra-driver.test \ +test-driver-custom.test \ +test-driver-custom-xfail-tests.test \ +test-driver-custom-multitest.test \ +test-driver-custom-multitest-recheck.test \ +test-driver-custom-multitest-recheck2.test \ +test-driver-custom-html.test \ +test-driver-custom-no-html.test \ +test-driver-create-log-dir.test \ +test-driver-strip-vpath.test \ +test-driver-trs-suffix-registered.test \ +test-driver-fail.test \ +test-driver-is-distributed.test \ +test-extensions.test \ +test-extensions-cond.test \ +test-harness-vpath-rewrite.test \ +test-log.test \ +test-logs-repeated.test \ +test-metadata-global-log.test \ +test-metadata-global-result.test \ +test-metadata-recheck.test \ +test-metadata-results.test \ +test-missing.test \ +test-missing2.test \ +test-trs-basic.test \ +test-trs-recover.test \ +test-trs-recover2.test \ +parse.test \ +percent.test \ +percent2.test \ +phony.test \ +pluseq.test \ +pluseq2.test \ +pluseq3.test \ +pluseq4.test \ +pluseq5.test \ +pluseq6.test \ +pluseq7.test \ +pluseq8.test \ +pluseq9.test \ +pluseq10.test \ +pluseq11.test \ +posixsubst-data.test \ +posixsubst-extradist.test \ +posixsubst-ldadd.test \ +posixsubst-libraries.test \ +posixsubst-ltlibraries.test \ +posixsubst-programs.test \ +posixsubst-scripts.test \ +posixsubst-sources.test \ +posixsubst-tests.test \ +postproc.test \ +ppf77.test \ +pr2.test \ +pr9.test \ +pr72.test \ +pr87.test \ +pr204.test \ +pr211.test \ +pr220.test \ +pr224.test \ +pr229.test \ +pr243.test \ +pr266.test \ +pr279.test \ +pr279-2.test \ +pr287.test \ +pr300-lib.test \ +pr300-ltlib.test \ +pr300-prog.test \ +pr307.test \ +pr401.test \ +pr401b.test \ +pr401c.test \ +prefix.test \ +primary.test \ +primary2.test \ +primary3.test \ +primary-prefix-invalid-couples.tap \ +primary-prefix-valid-couples.test \ +primary-prefix-couples-force-valid.test \ +primary-prefix-couples-documented-valid.test \ +proginst.test \ +programs-primary-rewritten.test \ +py-compile-basedir.test \ +py-compile-basic.test \ +py-compile-basic2.test \ +py-compile-destdir.test \ +py-compile-env.test \ +py-compile-option-terminate.test \ +py-compile-usage.test \ +python.test \ +python2.test \ +python3.test \ +python4.test \ +python5.test \ +python5b.test \ +python6.test \ +python7.test \ +python8.test \ +python9.test \ +python10.test \ +python11.test \ +python12.test \ +python-dist.test \ +python-vars.test \ +python-virtualenv.test \ +recurs.test \ +recurs2.test \ +remake.test \ +remake1a.test \ +remake2.test \ +remake3.test \ +remake3a.test \ +remake4.test \ +remake5.test \ +remake6.test \ +remake7.test \ +remake8a.test \ +remake8b.test \ +remake9a.test \ +remake9b.test \ +remake9c.test \ +remake9d.test \ +remake10a.test \ +remake10b.test \ +remake10c.test \ +remake11.test \ +remake12.test \ +remake-all-1.test \ +remake-all-2.test \ +remake-subdir-from-subdir.test \ +remake-subdir-gnu.test \ +remake-subdir.test \ +remake-subdir2.test \ +remake-subdir-long-time.test \ +remake-gnulib-add-acsubst.test \ +remake-gnulib-add-header.test \ +remake-gnulib-remove-header.test \ +remake-moved-m4-file.test \ +remake-deleted-m4-file.test \ +remake-renamed-m4-file.test \ +remake-renamed-m4-macro-and-file.test \ +remake-renamed-m4-macro.test \ +pr8365-remake-timing.test \ +regex.test \ +regex-obsolete.test \ +req.test \ +reqd.test \ +reqd2.test \ +repeated-options.test \ +rulepat.test \ +self-check-cleanup.tap \ +self-check-dir.tap \ +self-check-env-sanitize.tap \ +self-check-exit.tap \ +self-check-explicit-skips.test \ +self-check-is_newest.tap \ +self-check-me.tap \ +self-check-reexec.tap \ +self-check-report.test \ +self-check-sanity.test \ +self-check-seq.tap \ +self-check-is-blocked-signal.tap \ +self-check-tap.test \ +self-check-unindent.tap \ +sanity.test \ +scripts.test \ +seenc.test \ +silent.test \ +silent2.test \ +silent3.test \ +silent4.test \ +silent6.test \ +silent7.test \ +silent8.test \ +silent9.test \ +silentcxx.test \ +silentcxx-gcc.test \ +silentf77.test \ +silentf90.test \ +silent-many-gcc.test \ +silent-many-generic.test \ +silent-lex-gcc.test \ +silent-lex-generic.test \ +silent-yacc-gcc.test \ +silent-yacc-generic.test \ +silent-nowarn.test \ +silent-configsite.test \ +srcsub.test \ +srcsub2.test \ +space.test \ +specflg.test \ +specflg2.test \ +specflg3.test \ +specflg6.test \ +specflg7.test \ +specflg8.test \ +specflg9.test \ +specflg10.test \ +specflg-dummy.test \ +spell.test \ +spell2.test \ +spell3.test \ +spelling.test \ +spy.test \ +stdinc.test \ +stamph2.test \ +stdlib.test \ +stdlib2.test \ +strictness-override.test \ +strictness-precedence.test \ +strip.test \ +strip2.test \ +strip3.test \ +subdir.test \ +subdir2.test \ +subdir3.test \ +subdir4.test \ +subdir5.test \ +subdir6.test \ +subdir7.test \ +subdir8.test \ +subdir9.test \ +subdir10.test \ +subdirbuiltsources.test \ +subcond.test \ +subcond2.test \ +subcond3.test \ +subobj.test \ +subobj2.test \ +subobj4.test \ +subobj5.test \ +subobj6.test \ +subobj7.test \ +subobj8.test \ +subobj9.test \ +subobj10.test \ +subobj11a.test \ +subobj11b.test \ +subobj11c.test \ +subobjname.test \ +subpkg.test \ +subpkg2.test \ +subpkg3.test \ +subpkg4.test \ +subpkg-yacc.test \ +subst.test \ +subst3.test \ +subst4.test \ +subst5.test \ +subst-no-trailing-empty-line.test \ +substref.test \ +substre2.test \ +substtarg.test \ +suffix.test \ +suffix2.test \ +suffix3.tap \ +suffix4.test \ +suffix5.test \ +suffix6.test \ +suffix6b.test \ +suffix6c.test \ +suffix7.test \ +suffix8.tap \ +suffix9.test \ +suffix10.tap \ +suffix11.tap \ +suffix12.test \ +suffix13.test \ +suffix-chain.tap \ +symlink.test \ +symlink2.test \ +syntax.test \ +tap-ambiguous-directive.test \ +tap-autonumber.test \ +tap-bailout.test \ +tap-bailout-and-logging.test \ +tap-bailout-suppress-badexit.test \ +tap-bailout-suppress-later-diagnostic.test \ +tap-bailout-suppress-later-errors.test \ +tap-color.test \ +tap-deps.test \ +tap-diagnostic.test \ +tap-empty-diagnostic.test \ +tap-empty.test \ +tap-escape-directive.test \ +tap-escape-directive-2.test \ +tap-exit.test \ +tap-signal.tap \ +tap-fancy.test \ +tap-fancy2.test \ +tap-global-log.test \ +tap-global-result.test \ +tap-html.test \ +tap-log.test \ +tap-msg0-result.test \ +tap-msg0-directive.test \ +tap-msg0-planskip.test \ +tap-msg0-bailout.test \ +tap-msg0-misc.test \ +tap-merge-stdout-stderr.test \ +tap-no-merge-stdout-stderr.test \ +tap-no-disable-hard-error.test \ +tap-no-spurious-summary.test \ +tap-no-spurious-numbers.test \ +tap-no-spurious.test \ +tap-not-ok-skip.test \ +tap-number-wordboundary.test \ +tap-numeric-description.test \ +tap-negative-numbers.test \ +tap-numbers-leading-zero.test \ +tap-out-of-order.test \ +tap-passthrough.test \ +tap-passthrough-exit.test \ +tap-plan.test \ +tap-plan-corner.test \ +tap-plan-errors.test \ +tap-plan-middle.test \ +tap-plan-whitespace.test \ +tap-plan-leading-zero.test \ +tap-plan-malformed.test \ +tap-missing-plan-and-bad-exit.test \ +tap-planskip.test \ +tap-planskip-late.test \ +tap-planskip-and-logging.test \ +tap-planskip-unplanned.test \ +tap-planskip-unplanned-corner.test \ +tap-planskip-case-insensitive.test \ +tap-planskip-whitespace.test \ +tap-planskip-badexit.test \ +tap-planskip-bailout.test \ +tap-planskip-later-errors.test \ +tap-realtime.test \ +tap-test-number-0.test \ +tap-recheck-logs.test \ +tap-result-comment.test \ +tap-todo-skip-together.test \ +tap-todo-skip-whitespace.test \ +tap-todo-skip.test \ +tap-unplanned.test \ +tap-whitespace-normalization.test \ +tap-with-and-without-number.test \ +tap-xfail-tests.test \ +tap-common-setup.test \ +tap-bad-prog.tap \ +tap-basic.test \ +tap-diagnostic-custom.test \ +tap-driver-stderr.test \ +tap-doc.test \ +tap-doc2.test \ +tap-more.test \ +tap-more2.test \ +tap-recheck.test \ +tap-summary.test \ +tap-summary-color.test \ +tags.test \ +tags2.test \ +tagsub.test \ +tar.test \ +tar2.test \ +tar3.test \ +target-cflags.test \ +targetclash.test \ +tests-environment-fd-redirect.test \ +tests-environment-and-log-compiler.test \ +txinfo.test \ +txinfo2.test \ +txinfo3.test \ +txinfo4.test \ +txinfo5.test \ +txinfo5b.test \ +txinfo6.test \ +txinfo7.test \ +txinfo8.test \ +txinfo9.test \ +txinfo10.test \ +txinfo13.test \ +txinfo16.test \ +txinfo17.test \ +txinfo18.test \ +txinfo19.test \ +txinfo20.test \ +txinfo21.test \ +txinfo22.test \ +txinfo23.test \ +txinfo24.test \ +txinfo25.test \ +txinfo26.test \ +txinfo27.test \ +txinfo28.test \ +txinfo29.test \ +txinfo30.test \ +txinfo31.test \ +txinfo32.test \ +txinfo33.test \ +txinfo-unrecognized-extension.test \ +transform.test \ +transform2.test \ +uninstall-fail.test \ +uninstall-pr9578.test \ +unused.test \ +upc.test \ +upc2.test \ +upc3.test \ +vala.test \ +vala1.test \ +vala2.test \ +vala3.test \ +vala4.test \ +vala5.test \ +vala-vpath.test \ +vars.test \ +vars3.test \ +vartar.test \ +vartypos.test \ +vartypo2.test \ +version.test \ +version2.test \ +version3.test \ +version4.test \ +version6.test \ +version7.test \ +version8.test \ +vpath.test \ +vtexi.test \ +vtexi2.test \ +vtexi3.test \ +vtexi4.test \ +warnings-override.test \ +warnings-precedence.test \ +warnings-strictness-interactions.test \ +warnings-unknown.test \ +warnopts.test \ +warnings-win-over-strictness.test \ +warning-groups-win-over-strictness.test \ +werror.test \ +werror2.test \ +werror3.test \ +werror4.test \ +whoami.test \ +xsource.test \ +xz.test \ +yacc-basic.test \ +yacc-d-basic.test \ +yacc-clean.test \ +yacc.test \ +yacc2.test \ +yacc4.test \ +yacc5.test \ +yacc6.test \ +yacc7.test \ +yacc8.test \ +yaccdry.test \ +yacc-dist-nobuild.test \ +yacc-nodist.test \ +yaccpp.test \ +yaccvpath.test \ +yacc-d-vpath.test \ +yacc-dist-nobuild-subdir.test \ +yflags.test \ +yflags2.test \ +yflags-cmdline-override.test \ +yflags-conditional.test \ +yflags-d-false-positives.test \ +yflags-force-override.test \ +yflags-force-conditional.test \ +yflags-var-expand.test + +print-list-of-tests: + @echo $(handwritten_TESTS) +.PHONY: print-list-of-tests diff --cc tests/location.test index f96a09e70,7eb6549bd..eee479744 --- a/tests/location.test +++ b/tests/location.test @@@ -42,15 -43,8 +43,17 @@@ VAR = 1 3 END + : > ar-lib + +# Smash the useless difference of lib file locations. +smash_useless_diffs () +{ + # FIXME: we could get rid of the second 's|||' once we improve our + # wrapper scripts ... + sed -e "s|^$am_amdir/\\([a-z]*\.am\\)|\\1|" \ + -e "s|^automake-$APIVERSION:|automake:|" ${1+"$@"}; +} + $ACLOCAL AUTOMAKE_fails -Wno-error diff --cc tests/ltcond2.test index 42da11bb1,95b985ab7..4f28cc6f6 --- a/tests/ltcond2.test +++ b/tests/ltcond2.test @@@ -21,9 -21,10 +21,10 @@@ required='cc native libtoolize cat >> configure.in << 'END' AC_PROG_CC + AM_PROG_AR AC_PROG_LIBTOOL AC_SUBST([HELLO_SYSTEM], [hello-generic.lo]) -AM_CONDITIONAL([LINUX], true) +AM_CONDITIONAL([LINUX], [true]) AC_OUTPUT END diff --cc tests/ltconv.test index c0a1099e0,afd271699..00c8cd785 --- a/tests/ltconv.test +++ b/tests/ltconv.test @@@ -22,11 -22,12 +22,12 @@@ required='cc native libtoolize cat >>configure.in <<'END' AC_PROG_CC + AM_PROG_AR AC_PROG_LIBTOOL -AC_CONFIG_FILES(sub1/Makefile - sub2/Makefile - sub2/sub21/Makefile - sub2/sub22/Makefile) +AC_CONFIG_FILES([sub1/Makefile + sub2/Makefile + sub2/sub21/Makefile + sub2/sub22/Makefile]) AC_OUTPUT END diff --cc tests/pr307.test index 9db74c0e4,f1ab9a983..24dd02137 --- a/tests/pr307.test +++ b/tests/pr307.test @@@ -66,10 -66,10 +66,10 @@@ don libtoolize --force $ACLOCAL $AUTOCONF - $AUTOMAKE -a + $AUTOMAKE -Wno-extra-portability -a # Sanity check: make sure the variable we are attempting to force -# is used by configure +# is indeed used by configure. grep am_cv_CC_dependencies_compiler_type configure ./configure am_cv_CC_dependencies_compiler_type=dashmstdout diff --cc tests/primary-prefix-couples-documented-valid.test index 134c21220,c09e6cab2..5bd91601f --- a/tests/primary-prefix-couples-documented-valid.test +++ b/tests/primary-prefix-couples-documented-valid.test @@@ -20,8 -20,11 +20,9 @@@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' AC_PROG_CC + AM_PROG_AR AC_PROG_RANLIB AC_PROG_LIBTOOL AM_PROG_GCJ diff --cc tests/primary-prefix-couples-force-valid.test index b462a7dd5,d60ecbf0c..405f6060a --- a/tests/primary-prefix-couples-force-valid.test +++ b/tests/primary-prefix-couples-force-valid.test @@@ -26,8 -26,11 +26,9 @@@ required=cc . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' AC_PROG_CC + AM_PROG_AR AC_PROG_RANLIB AC_OUTPUT END diff --cc tests/primary-prefix-valid-couples.test index f25db95d8,13520f2ae..e075db6af --- a/tests/primary-prefix-valid-couples.test +++ b/tests/primary-prefix-valid-couples.test @@@ -19,8 -19,11 +19,9 @@@ . ./defs || Exit 1 -set -e - cat >> configure.in <<'END' AC_PROG_CC + AM_PROG_AR AC_PROG_RANLIB AC_PROG_LIBTOOL AM_PATH_PYTHON diff --cc tests/suffix.test index 0c29881d8,3701b0c38..9f0a5ffa4 --- a/tests/suffix.test +++ b/tests/suffix.test @@@ -31,16 -31,28 +31,28 @@@ noinst_PROGRAMS = fo noinst_LIBRARIES = libbar.a END - $ACLOCAL + for use_arlib in false :; do - $AUTOMAKE -i - grep '^ *\.c' Makefile.in # For debugging. - test `grep -c '^\.c\.o:' Makefile.in` -eq 1 - test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 + if $use_arlib; then + am_warns= + echo AM_PROG_AR >> configure.in + : > ar-lib + else + am_warns=-Wno-extra-portability + fi - $AUTOMAKE - grep '^ *\.c' Makefile.in # For debugging. - test `grep -c '^\.c\.o:' Makefile.in` -eq 1 - test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 + $ACLOCAL --force + + $AUTOMAKE $am_warns -i - grep '^ *\.c' Makefile.in # for debugging ++ grep '^ *\.c' Makefile.in # For debugging. + test `grep -c '^\.c\.o:' Makefile.in` -eq 1 + test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 + + $AUTOMAKE $am_warns - grep '^ *\.c' Makefile.in # for debugging ++ grep '^ *\.c' Makefile.in # For debugging. + test `grep -c '^\.c\.o:' Makefile.in` -eq 1 + test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 + + done : diff --cc tests/suffix2.test index 2b7327961,434077b58..513d01715 --- a/tests/suffix2.test +++ b/tests/suffix2.test @@@ -41,13 -42,13 +42,13 @@@ EN $ACLOCAL - $AUTOMAKE -i + $AUTOMAKE -a -grep '^ *\.c' Makefile.in # for debugging +grep '^ *\.c' Makefile.in # For debugging. test `grep -c '^\.c\.o:' Makefile.in` -eq 1 test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 - $AUTOMAKE + $AUTOMAKE -i -grep '^ *\.c' Makefile.in # for debugging +grep '^ *\.c' Makefile.in # For debugging. test `grep -c '^\.c\.o:' Makefile.in` -eq 1 test `grep -c '^\.c\.obj:' Makefile.in` -eq 1 diff --cc tests/suffix8.tap index 7b074960a,8a29b8b3f..8a819a967 --- a/tests/suffix8.tap +++ b/tests/suffix8.tap @@@ -18,12 -18,11 +18,13 @@@ # same suffix. # From PR/37. -required=libtoolize +required='cc libtoolize' . ./defs || Exit 1 +plan_ 10 + cat >>configure.in <<'END' + AM_PROG_AR AM_PROG_LIBTOOL AC_OUTPUT END