[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1276-g94be283 |
|
Date: |
Fri, 02 Sep 2011 09:14:16 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=94be2839c1a51f9c47eaf9e0deba79bb59b27dd2
The branch, testsuite-work has been updated
via 94be2839c1a51f9c47eaf9e0deba79bb59b27dd2 (commit)
via 1b56fe0cd10a77e329221cad75636588783f1da2 (commit)
via f1652f6f8ef9db10cadd41fa77f77a87aed304d2 (commit)
via 199b9086f51927fb99663cac42934337352cce69 (commit)
via b110067c6ec69ac5081a2fc50d1d645d60c73aab (commit)
via eb59c423d7addf124d33f50ac920789db1304adb (commit)
via 1dcba7b847b137330ed91ef8269d403163387e7e (commit)
via 136b48998f4a5db717e16200fcdf4bb907703646 (commit)
via 392800a64e30930e8ff3771db6805b1faeb2ce13 (commit)
via c8d4c3f4b21b598302f2310f6fcc747cf92f8d64 (commit)
via 52a55e9881f5f37ac7587312b4e8526f90ab3d5a (commit)
via f1c937eee51a6cd5ac651fde70ac285f32419eb6 (commit)
via d3334a68d7291428d9c0178b60abe2d9d52c8fd6 (commit)
via d4a102bec07f508ba1e509d6ee3ed960e377042b (commit)
via 16f67b47492d97cac0866b02304b08fdde4d069e (commit)
via 1a1c1339db861cee13ed8b8b05b0c41428214b7a (commit)
via 0cbcf393dbdaa2ff36b11cf2516675e78eada49f (commit)
from a8650c3ed060f496acef2d6dd13b8c67e93dd104 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 94be2839c1a51f9c47eaf9e0deba79bb59b27dd2
Merge: 1b56fe0 f1652f6
Author: Stefano Lattarini <address@hidden>
Date: Fri Sep 2 10:53:49 2011 +0200
Merge branch 'master' into testsuite-work
* master:
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
commit 1b56fe0cd10a77e329221cad75636588783f1da2
Merge: 52a55e9 199b908
Author: Stefano Lattarini <address@hidden>
Date: Fri Sep 2 10:45:19 2011 +0200
Merge branch 'remove-deansification' into testsuite-work
* remove-deansification:
automake: fix regression due to de-ansification support removal
automake: cleanups after de-ansification support removal (2)
automake: cleanups after de-ansification support removal (1)
ansi: remove obsolete code/files for de-ANSI-fication support
ansi: reject attempts to use automatic de-ANSI-fication support
tests: remove tests about obsolete de-ANSI-fication support
docs: remove description of de-ANSI-fication support from manual
commit 52a55e9881f5f37ac7587312b4e8526f90ab3d5a
Author: Stefano Lattarini <address@hidden>
Date: Mon Aug 29 14:52:13 2011 +0200
tests: better respect of TAP usage in wrapped tests
* tests/gen-wrap-tests: Partial rewrite to take into account the
possibility that the wrapped test uses the TAP protocol. This
complicates the code quite a bit, but is essential to ensure real
correctness in all the wrapped scripts.
* tests/wrap-tests.sh: Update, and add few more sanity checks.
commit f1c937eee51a6cd5ac651fde70ac285f32419eb6
Author: Stefano Lattarini <address@hidden>
Date: Mon Aug 29 11:09:18 2011 +0200
tests: use both perl and awk implementations for tests on TAP
* tests/gen-wrap-tests (get_list_for_pltap): New function, gets
the list of tests that check the Automake TAP support.
($defines_for_pltap): New variable.
($wrapper_type_list): Add "pltap".
* tests/defs-static.in: Check that `$am_tap_implementation' is
not exported in the environment.
* tests/self-check-env-sanitize.tap: Update.
commit d3334a68d7291428d9c0178b60abe2d9d52c8fd6
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 26 12:14:27 2011 +0200
tests: two single auxiliary scripts to run/generate wrapped tests
* tests/config-shell-tests.sh, tests/parallel-tests.sh,
tests/gen-config-shell-tests, tests/gen-parallel-tests: Deleted,
their roles taken over by ...
* tests/wrap-tests.sh, tests/gen-wrap-tests: ... these new more
general scripts.
* tests/Makefile.am (EXTRA_DIST): Distribute the new scripts, and
do not distribute the obsolete ones anymore.
($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am): Do
not include nor generate anymore, they have been superseded by ...
($(srcdir)/wrap-tests.am): ... this new fragment, automatically
generated by `gen-wrap-tests'.
(PTEST_LOG_COMPILER, SHTST_LOG_COMPILER): Delete, they are now
defined in the new `wrap-tests.am' makefile fragment.
(TEST_EXTENSIONS): Do not append to it anymore, that is now done
by the new `wrap-tests.am' makefile fragment above.
($(parallel_tests:.ptest=.log), $(config_shell_tests:.shtst=.log),
$(parallel_tests), $(config_shell_tests): Remove this dependencies,
superseded by ...
($(wrap_TESTS), $(wrap_LOGS)): ... these ones.
(MAINTAINERCLEANFILES): Delete, it's not used anymore.
(TESTS): Do not contain anymore `$(config_shell_tests)' nor
`$(parallel_tests)', contain `$(wrap_TESTS)' instead, as defined
by `$(srcdir)/wrap-tests.am'.
Other related minor edits and reorderings.
* bootstrap, tests/.gitignore, tests/README: Update.
commit d4a102bec07f508ba1e509d6ee3ed960e377042b
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 27 15:01:33 2011 +0200
tests: list of tests placed in a separate Makefile fragment
This change allows us to easily use make instead of by-hand (and
more fragile) grepping to extract the list of hand-written tests
from our Makefiles.
* bootstrap (BOOTSTRAP_MAKE): New variable.
Use it to run make in order to extract the list of hand-written
tests from ...
* tests/list-of-tests.mk: ... this new file, where they are
listed in ...
(handwritten_TESTS, tap_with_common_setup_TESTS, tap_other_TESTS):
... these variables, extracted respectively from ...
* tests/Makefile.am (handwritten_tests, tap_other_tests,
tap_with_common_setup_tests): ... these older variables, now
removed.
(EXTRA_DIST, expected_list_of_tests): Update w.r.t. the variable
names' changes.
(include $(srcdir)/list-of-tests.mk): New inclusion.
Remove an overkill indirection, and with it ...
(tap_with_common_setup_logs): ... this variable.
($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am):
Update to match the new interface of ...
(gen-parallel-tests, gen-config-shell-tests): ... these scripts,
that now read the list of tests from the standard input.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 199 ++++
NEWS | 7 +-
THANKS | 1 +
automake.in | 285 +-----
bootstrap | 7 +-
doc/automake.texi | 145 +--
lib/Automake/Options.pm | 14 +-
lib/Automake/Variable.pm | 2 -
lib/Makefile.am | 3 +-
lib/Makefile.in | 10 +-
lib/am/Makefile.am | 3 +-
lib/am/Makefile.in | 3 +-
lib/am/ansi2knr.am | 77 --
lib/ansi2knr.1 | 36 -
lib/ansi2knr.c | 739 ------------
m4/depout.m4 | 4 +-
m4/protos.m4 | 27 +-
tests/.gitignore | 3 +-
tests/Makefile.am | 1193 +-------------------
tests/Makefile.in | 462 ++++++--
tests/README | 19 +-
tests/ansi.test | 52 -
tests/ansi10.test | 72 --
tests/ansi2.test | 38 -
tests/ansi2knr-deprecation.test | 67 --
tests/ansi2knr-no-more.test | 56 +
tests/ansi3.test | 51 -
tests/ansi3b.test | 53 -
tests/ansi4.test | 40 -
tests/ansi5.test | 86 --
tests/ansi6.test | 83 --
tests/ansi7.test | 85 --
tests/ansi8.test | 28 -
tests/ansi9.test | 67 --
tests/config-shell-tests.sh | 53 -
tests/cxxansi.test | 45 -
tests/defs-static.in | 1 +
tests/depacl2.test | 13 +-
....test => doc-parsing-buglets-colneq-subst.test} | 29 +-
tests/doc-parsing-buglets-tabs.test | 61 +
tests/gen-config-shell-tests | 70 --
tests/gen-parallel-tests | 64 --
tests/gen-wrap-tests | 185 +++
tests/libobj8.test | 51 -
tests/{Makefile.am => list-of-tests.mk} | 232 +----
.../{output3.test => no-extra-makefile-code.test} | 22 +-
tests/parallel-tests.sh | 52 -
tests/self-check-env-sanitize.tap | 3 +-
tests/subobj3.test | 60 -
tests/{distcheck-hook.test => vala-vpath.test} | 45 +-
tests/wrap-tests.sh | 89 ++
51 files changed, 1141 insertions(+), 3951 deletions(-)
delete mode 100644 lib/am/ansi2knr.am
delete mode 100644 lib/ansi2knr.1
delete mode 100644 lib/ansi2knr.c
delete mode 100755 tests/ansi.test
delete mode 100755 tests/ansi10.test
delete mode 100755 tests/ansi2.test
delete mode 100755 tests/ansi2knr-deprecation.test
create mode 100755 tests/ansi2knr-no-more.test
delete mode 100755 tests/ansi3.test
delete mode 100755 tests/ansi3b.test
delete mode 100755 tests/ansi4.test
delete mode 100755 tests/ansi5.test
delete mode 100755 tests/ansi6.test
delete mode 100755 tests/ansi7.test
delete mode 100755 tests/ansi8.test
delete mode 100755 tests/ansi9.test
delete mode 100755 tests/config-shell-tests.sh
delete mode 100755 tests/cxxansi.test
copy tests/{autodist-acconfig.test => doc-parsing-buglets-colneq-subst.test}
(55%)
create mode 100755 tests/doc-parsing-buglets-tabs.test
delete mode 100755 tests/gen-config-shell-tests
delete mode 100755 tests/gen-parallel-tests
create mode 100755 tests/gen-wrap-tests
delete mode 100755 tests/libobj8.test
copy tests/{Makefile.am => list-of-tests.mk} (73%)
copy tests/{output3.test => no-extra-makefile-code.test} (62%)
delete mode 100755 tests/parallel-tests.sh
delete mode 100755 tests/subobj3.test
copy tests/{distcheck-hook.test => vala-vpath.test} (61%)
create mode 100755 tests/wrap-tests.sh
diff --git a/ChangeLog b/ChangeLog
index f6f4447..a5f89d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,202 @@
+2011-09-02 Stefano Lattarini <address@hidden>
+
+ coverage: vala support failing for VPATH from-scratch builds
+ * tests/vala-vpath.test: New test, xfailing.
+ * tests/Makefile.am (TESTS): Update.
+ * THANKS: Update.
+ From a report by Zbigniew JÄdrzejewski-Szmek.
+ Related to automake bug#8753.
+
+2011-09-01 Stefano Lattarini <address@hidden>
+
+ docs: report few more automake parsing limitations
+ Partly motivated by automake bug#8360.
+ * doc/automake.texi (General Operation): Report few more automake
+ limitations w.r.t. parsing of unusual makefile constructs. Related
+ minor reorderings.
+ * tests/doc-parsing-buglets-colneq-subst.test: New test.
+ * tests/doc-parsing-buglets-tabs.test: Likewise.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-09-01 Stefano Lattarini <address@hidden>
+
+ automake: fix regression due to de-ansification support removal
+ The last change `v1.11-947-g136b489' removed code that automake
+ was using to decide whether binary objects were built by the
+ generated Makefile.in, so that it could avoid to emit unneeded
+ code when this was not the case. Re-introduce such code in a
+ less-obfuscated form, and add a test to ensure we don't regress
+ again.
+ * automake.in ($must_handle_compiled_objects): New global
+ variable, telling whether the generated Makefile has to build
+ compiled objects.
+ (initialize_per_input): Reset it.
+ (handle_programs, handle_libraries, handle_ltlibraries): Set
+ it to a true value when required.
+ (handle_compile): Don't generate any code if the variable
+ `$must_handle_compiled_objects' is not set to a true value.
+ * tests/no-extra-makefile-code.test: New test.
+ * tests/Makefile.am (TESTS): Add it.
+
+2011-08-28 Stefano Lattarini <address@hidden>
+
+ automake: cleanups after de-ansification support removal (2)
+ * automake.in ($get_object_extension_was_run): Remove, it's not
+ really needed anymore.
+ (&get_object_extension): Remove, it's a no-op now.
+ All callers adjusted.
+
+2011-08-28 Stefano Lattarini <address@hidden>
+
+ automake: cleanups after de-ansification support removal (1)
+ * automake.in (lang_c_rewrite, handle_single_transform): Rename
+ variable `$nonansi_obj' to `$obj'.
+
+2011-08-28 Stefano Lattarini <address@hidden>
+
+ ansi: remove obsolete code/files for de-ANSI-fication support
+ * lib/ansi2knr.1, lib/ansi2knr.c: Deleted.
+ * lib/Makefile.am (dist_pkgvdata_DATA): Do not list them anymore.
+ * lib/am/ansi2knr.am: Delete.
+ * lib/am/Makefile.am (dist_am_DATA): Do not list it anymore.
+ * lib/Automake/Variable.pm (%_am_macro_for_var): Remove entries for
+ `ANSI2KNR' and `U'.
+ * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Don't care anymore
+ about possible definition of the `$U' variable.
+ * automake.in (@common_files): Drop `ansi2knr.1' and `ansi2knr.c'.
+ (struct): Remove scalar field `ansi'.
+ All callers adjusted.
+ (&lang_c_finish, %de_ansi_files): Remove, they're not required
+ anymore.
+ All callers adjusted.
+ ($get_object_extension_was_run): Fix typo in comment.
+ (&get_object_extension): Drop code dealing with de-ansification;
+ this function basically a no-op now, but is required to properly
+ initialize `$get_object_extension_was_run' variable.
+ (&handle_languages, &handle_compile, &lang_c_rewrite): Drop code
+ dealing with de-ansification.
+
+2011-08-28 Stefano Lattarini <address@hidden>
+
+ ansi: reject attempts to use automatic de-ANSI-fication support
+ * tests/protos.m4 (AM_C_PROTOTYPES): Error out whenever called.
+ * lib/Automake/Options.pm (_process_option_list ): Error out
+ with a proper error message when the `ansi2knr' option is used.
+ Related updates to comments.
+ * tests/depacl2.test: Update.
+ * tests/ansi2knr-no-more.test: New test.
+ * tests/Makefile.am (TESTS): Add it.
+ * NEWS: Update.
+
+2011-08-28 Stefano Lattarini <address@hidden>
+
+ tests: remove tests about obsolete de-ANSI-fication support
+ * tests/ansi.test: Delete.
+ * tests/ansi10.test: Likewise.
+ * tests/ansi2.test: Likewise.
+ * tests/ansi2knr-deprecation.test: Likewise.
+ * tests/ansi3.test: Likewise.
+ * tests/ansi3b.test: Likewise.
+ * tests/ansi4.test: Likewise.
+ * tests/ansi5.test: Likewise.
+ * tests/ansi6.test: Likewise.
+ * tests/ansi7.test: Likewise.
+ * tests/ansi8.test: Likewise.
+ * tests/ansi9.test: Likewise.
+ * tests/cxxansi.test: Likewise.
+ * tests/libobj8.test: Likewise.
+ * tests/subobj3.test: Likewise.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-08-28 Stefano Lattarini <address@hidden>
+
+ docs: remove description of de-ANSI-fication support from manual
+ * doc/automake.texi (Auxiliary Programs): Remove mention of
+ `ansi2knr.c' and `ansi2knr.1'.
+ (Obsolete Macros): Remove mention of `AM_C_PROTOTYPES'. Do not
+ index it nor variables `ANSI2KNR' and `U' anymore.
+ (List of Automake options): Remove mention of `ansi2knr' option,
+ and obsolete entries for concept and option indexes.
+ (Optional): Remove entry about `AM_C_PROTOTYPES'.
+ (@c LocalWords): Remove `ansi' and `knr'.
+ (@menu, @detailmenu): Remove entries about de-ANSI-fication
+ support.
+
+2011-08-29 Stefano Lattarini <address@hidden>
+
+ tests: better respect of TAP usage in wrapped tests
+ * tests/gen-wrap-tests: Partial rewrite to take into account the
+ possibility that the wrapped test uses the TAP protocol. This
+ complicates the code quite a bit, but is essential to ensure real
+ correctness in all the wrapped scripts.
+ * tests/wrap-tests.sh: Update, and add few more sanity checks.
+
+2011-08-29 Stefano Lattarini <address@hidden>
+
+ tests: use both perl and awk implementations for tests on TAP
+ * tests/gen-wrap-tests (get_list_for_pltap): New function, gets
+ the list of tests that check the Automake TAP support.
+ ($defines_for_pltap): New variable.
+ ($wrapper_type_list): Add "pltap".
+ * tests/defs-static.in: Check that `$am_tap_implementation' is
+ not exported in the environment.
+ * tests/self-check-env-sanitize.tap: Update.
+
+2011-08-29 Stefano Lattarini <address@hidden>
+
+ tests: two single auxiliary scripts to run/generate wrapped tests
+ * tests/config-shell-tests.sh, tests/parallel-tests.sh,
+ tests/gen-config-shell-tests, tests/gen-parallel-tests: Deleted,
+ their roles taken over by ...
+ * tests/wrap-tests.sh, tests/gen-wrap-tests: ... these new more
+ general scripts.
+ * tests/Makefile.am (EXTRA_DIST): Distribute the new scripts, and
+ do not distribute the obsolete ones anymore.
+ ($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am): Do
+ not include nor generate anymore, they have been superseded by ...
+ ($(srcdir)/wrap-tests.am): ... this new fragment, automatically
+ generated by `gen-wrap-tests'.
+ (PTEST_LOG_COMPILER, SHTST_LOG_COMPILER): Delete, they are now
+ defined in the new `wrap-tests.am' makefile fragment.
+ (TEST_EXTENSIONS): Do not append to it anymore, that is now done
+ by the new `wrap-tests.am' makefile fragment above.
+ ($(parallel_tests:.ptest=.log), $(config_shell_tests:.shtst=.log),
+ $(parallel_tests), $(config_shell_tests): Remove this dependencies,
+ superseded by ...
+ ($(wrap_TESTS), $(wrap_LOGS)): ... these ones.
+ (MAINTAINERCLEANFILES): Delete, it's not used anymore.
+ (TESTS): Do not contain anymore `$(config_shell_tests)' nor
+ `$(parallel_tests)', contain `$(wrap_TESTS)' instead, as defined
+ by `$(srcdir)/wrap-tests.am'.
+ Other related minor edits and reorderings.
+ * bootstrap, tests/.gitignore, tests/README: Update.
+
+2011-08-29 Stefano Lattarini <address@hidden>
+
+ tests: list of tests placed in a separate Makefile fragment
+ This change allows us to easily use make instead of by-hand (and
+ more fragile) grepping to extract the list of hand-written tests
+ from our Makefiles.
+ * bootstrap (BOOTSTRAP_MAKE): New variable.
+ Use it to run make in order to extract the list of hand-written
+ tests from ...
+ * tests/list-of-tests.mk: ... this new file, where they are
+ listed in ...
+ (handwritten_TESTS, tap_with_common_setup_TESTS, tap_other_TESTS):
+ ... these variables, extracted respectively from ...
+ * tests/Makefile.am (handwritten_tests, tap_other_tests,
+ tap_with_common_setup_tests): ... these older variables, now
+ removed.
+ (EXTRA_DIST, expected_list_of_tests): Update w.r.t. the variable
+ names' changes.
+ (include $(srcdir)/list-of-tests.mk): New inclusion.
+ Remove an overkill indirection, and with it ...
+ (tap_with_common_setup_logs): ... this variable.
+ ($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am):
+ Update to match the new interface of ...
+ (gen-parallel-tests, gen-config-shell-tests): ... these scripts,
+ that now read the list of tests from the standard input.
+
2011-08-29 Stefano Lattarini <address@hidden>
tests: prefer AM_... variables to user-reserved ones in Makefile
diff --git a/NEWS b/NEWS
index f316bb0..b16a323 100644
--- a/NEWS
+++ b/NEWS
@@ -83,11 +83,6 @@ New in 1.11a:
- Initial and still experimental support for the TAP test protocol is
now provided.
-* WARNING: Future backward-incompatibilities!
-
- - The Automake support for automatic de-ANSI-fication will be removed in
- the next major Automake release (1.12).
-
* Miscellaneous changes:
- The `dist' and `dist-all' targets now can run compressors in parallel.
@@ -129,6 +124,8 @@ New in 1.11a:
user; still, the old Makefile.am files that used to define it should
still continue to work as before.
+ - Support for automatic de-ANSI-fication has been removed.
+
Bugs fixed in 1.11a:
- Lots of minor bugfixes.
diff --git a/THANKS b/THANKS
index 63afbed..dd04090 100644
--- a/THANKS
+++ b/THANKS
@@ -369,6 +369,7 @@ William S Fulton address@hidden
Yann Droneaud address@hidden
Younes Younes address@hidden
Zack Weinberg address@hidden
+Zbigniew JÄdrzejewski-Szmek address@hidden
Zoltan Rado address@hidden
;; Local Variables:
diff --git a/automake.in b/automake.in
index b8fdde3..cbf82e1 100644
--- a/automake.in
+++ b/automake.in
@@ -53,7 +53,6 @@ struct (# Short name of the language (c, f77...).
# List of configure variables which must be defined.
'config_vars' => '@',
- 'ansi' => "\$",
# `pure' is `1' or `'. A `pure' language is one where, if
# all the files in a directory are of that language, then we
# do not require the C compiler or any code to call it.
@@ -233,7 +232,7 @@ my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh
ltcf-gcj.sh);
my @common_files =
(qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
- ansi2knr.1 ansi2knr.c ar-lib compile config.guess config.rpath
+ ar-lib compile config.guess config.rpath
config.sub depcomp elisp-comp install-sh libversion.in mdate-sh
missing mkinstalldirs py-compile texinfo.tex ylwrap),
@libtool_files, @libtool_sometimes);
@@ -568,12 +567,6 @@ my @dist_targets;
my %known_programs;
my %known_libraries;
-# Keys in this hash are the basenames of files which must depend on
-# ansi2knr. Values are either the empty string, or the directory in
-# which the ANSI source file appears; the directory must have a
-# trailing `/'.
-my %de_ansi_files;
-
# This keeps track of which extensions we've seen (that we care
# about).
my %extension_seen;
@@ -597,9 +590,9 @@ my %linkers_used;
# True if we need `LINK' defined. This is a hack.
my $need_link;
-# Was get_object_extension run?
-# FIXME: This is a hack. a better switch should be found.
-my $get_object_extension_was_run;
+# Does the generated Makefile have to build some compiled object
+# (for binary programs, or plain or libtool libraries)?
+my $must_handle_compiled_objects;
# Record each file processed by make_paragraphs.
my %transformed_files;
@@ -699,8 +692,6 @@ sub initialize_per_input ()
%known_programs = ();
%known_libraries= ();
- %de_ansi_files = ();
-
%extension_seen = ();
%language_scratch = ();
@@ -711,7 +702,7 @@ sub initialize_per_input ()
$need_link = 0;
- $get_object_extension_was_run = 0;
+ $must_handle_compiled_objects = 0;
%transformed_files = ();
}
@@ -725,7 +716,6 @@ sub initialize_per_input ()
register_language ('name' => 'c',
'Name' => 'C',
'config_vars' => ['CC'],
- 'ansi' => 1,
'autodep' => '',
'flags' => ['CFLAGS', 'CPPFLAGS'],
'ccer' => 'CC',
@@ -737,8 +727,7 @@ register_language ('name' => 'c',
'link' => '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
'compile_flag' => '-c',
'libtool_tag' => 'CC',
- 'extensions' => ['.c'],
- '_finish' => \&lang_c_finish);
+ 'extensions' => ['.c']);
# C++.
register_language ('name' => 'cxx',
@@ -895,10 +884,7 @@ register_language ('name' => 'asm',
'compiler' => 'CCASCOMPILE',
'compile_flag' => '-c',
'output_flag' => '-o',
- 'extensions' => ['.s'],
-
- # With assembly we still use the C linker.
- '_finish' => \&lang_c_finish);
+ 'extensions' => ['.s']);
# Preprocessed Assembler.
register_language ('name' => 'cppasm',
@@ -912,10 +898,7 @@ register_language ('name' => 'cppasm',
'compiler' => 'CPPASCOMPILE',
'compile_flag' => '-c',
'output_flag' => '-o',
- 'extensions' => ['.S', '.sx'],
-
- # With assembly we still use the C linker.
- '_finish' => \&lang_c_finish);
+ 'extensions' => ['.S', '.sx']);
# Fortran 77
register_language ('name' => 'f77',
@@ -1284,22 +1267,6 @@ sub shadow_unconditionally ($$)
return "\$($varname)"
}
-# get_object_extension ($EXTENSION)
-# ---------------------------------
-# Prefix $EXTENSION with $U if ansi2knr is in use.
-sub get_object_extension ($)
-{
- my ($extension) = @_;
-
- # Check for automatic de-ANSI-fication.
- $extension = '$U' . $extension
- if option 'ansi2knr';
-
- $get_object_extension_was_run = 1;
-
- return $extension;
-}
-
# check_user_variables (@LIST)
# ----------------------------
# Make sure each variable VAR in @LIST does not exist, suggest using AM_VAR
@@ -1524,97 +1491,6 @@ sub handle_languages
unless $depbase eq '';
$depbase .= '$(DEPDIR)/' . basename ($obj);
- # Support for deansified files in subdirectories is ugly
- # enough to deserve an explanation.
- #
- # A Note about normal ansi2knr processing first. On
- #
- # AUTOMAKE_OPTIONS = ansi2knr
- # bin_PROGRAMS = foo
- # foo_SOURCES = foo.c
- #
- # we generate rules similar to:
- #
- # foo: foo$U.o; link ...
- # foo$U.o: foo$U.c; compile ...
- # foo_.c: foo.c; ansi2knr ...
- #
- # this is fairly compact, and will call ansi2knr depending
- # on the value of $U (`' or `_').
- #
- # It's harder with subdir sources. On
- #
- # AUTOMAKE_OPTIONS = ansi2knr
- # bin_PROGRAMS = foo
- # foo_SOURCES = sub/foo.c
- #
- # we have to create foo_.c in the current directory.
- # (Unless the user asks 'subdir-objects'.) This is important
- # in case the same file (`foo.c') is compiled from other
- # directories with different cpp options: foo_.c would
- # be preprocessed for only one set of options if it were
- # put in the subdirectory.
- #
- # Because foo$U.o must be built from either foo_.c or
- # sub/foo.c we can't be as concise as in the first example.
- # Instead we output
- #
- # foo: foo$U.o; link ...
- # foo_.o: foo_.c; compile ...
- # foo.o: sub/foo.c; compile ...
- # foo_.c: foo.c; ansi2knr ...
- #
- # This is why we'll now transform $rule_file twice
- # if we detect this case.
- # A first time we output the compile rule with `$U'
- # replaced by `_' and the source directory removed,
- # and another time we simply remove `$U'.
- #
- # Note that at this point $source (as computed by
- # &handle_single_transform) is `sub/foo$U.c'.
- # This can be confusing: it can be used as-is when
- # subdir-objects is set, otherwise you have to know
- # it really means `foo_.c' or `sub/foo.c'.
- my $objdir = dirname ($obj);
- my $srcdir = dirname ($source);
- if ($lang->ansi && $obj =~ /\$U/)
- {
- prog_error "`$obj' contains \$U, but `$source' doesn't"
- if $source !~ /\$U/;
-
- (my $source_ = $source) =~ s/\$U/_/g;
- # Output an additional rule if _.c and .c are not in
- # the same directory. (_.c is always in $objdir.)
- if ($objdir ne $srcdir)
- {
- (my $obj_ = $obj) =~ s/\$U/_/g;
- (my $depbase_ = $depbase) =~ s/\$U/_/g;
- $source_ = basename ($source_);
-
- $output_rules .=
- file_contents ($rule_file,
- new Automake::Location,
- %transform,
- GENERIC => 0,
-
- DEPBASE => $depbase_,
- BASE => $obj_,
- SOURCE => $source_,
- SOURCEFLAG => $sourceflags{$srcext} || '',
- OBJ => "$obj_$myext",
- OBJOBJ => "$obj_.obj",
- LTOBJ => "$obj_.lo",
-
- COMPILE => $obj_compile,
- LTCOMPILE => $obj_ltcompile,
- -o => $output_flag,
- %file_transform);
- $obj =~ s/\$U//g;
- $depbase =~ s/\$U//g;
- $source =~ s/\$U//g;
- }
- }
-
$output_rules .=
file_contents ($rule_file,
new Automake::Location,
@@ -1770,7 +1646,7 @@ sub check_libobjs_sources
# $VAR is the name of the variable that the source filenames come from
# $TOPPARENT is the name of the _SOURCES variable which is being processed
# $DERIVED is the name of resulting executable or library
-# $OBJ is the object extension (e.g., `$U.lo')
+# $OBJ is the object extension (e.g., `.lo')
# $FILE the source file to transform
# %TRANSFORM contains extras arguments to pass to file_contents
# when producing explicit rules
@@ -1781,8 +1657,6 @@ sub handle_single_transform ($$$$$%)
my ($var, $topparent, $derived, $obj, $_file, %transform) = @_;
my @files = ($_file);
my @result = ();
- my $nonansi_obj = $obj;
- $nonansi_obj =~ s/\$U//g;
# Turn sources into objects. We use a while loop like this
# because we might add to @files in the loop.
@@ -1829,7 +1703,7 @@ sub handle_single_transform ($$$$$%)
# language function.
my $aggregate = 'AM';
- $extension = &derive_suffix ($extension, $nonansi_obj);
+ $extension = &derive_suffix ($extension, $obj);
my $lang;
if ($extension_map{$extension} &&
($lang = $languages{$extension_map{$extension}}))
@@ -1840,7 +1714,7 @@ sub handle_single_transform ($$$$$%)
# Do we have per-executable flags for this executable?
my $have_per_exec_flags = 0;
my @peflags = @{$lang->flags};
- push @peflags, 'LIBTOOLFLAGS' if $nonansi_obj eq '.lo';
+ push @peflags, 'LIBTOOLFLAGS' if $obj eq '.lo';
foreach my $flag (@peflags)
{
if (set_seen ("${derived}_$flag"))
@@ -1860,7 +1734,7 @@ sub handle_single_transform ($$$$$%)
my $subr = \&{'lang_' . $lang->name . '_rewrite'};
my ($r, $source_extension)
= &$subr ($directory, $base, $extension,
- $nonansi_obj, $have_per_exec_flags, $var);
+ $obj, $have_per_exec_flags, $var);
# Skip this entry if we were asked not to process it.
next if $r == LANG_IGNORE;
@@ -1873,13 +1747,9 @@ sub handle_single_transform ($$$$$%)
$this_obj_ext = $source_extension;
$derived_source = 1;
}
- elsif ($lang->ansi)
- {
- $this_obj_ext = $obj;
- }
else
{
- $this_obj_ext = $nonansi_obj;
+ $this_obj_ext = $obj;
}
$object = $base . $this_obj_ext;
@@ -1968,12 +1838,6 @@ sub handle_single_transform ($$$$$%)
$full_ansi = $base . $extension;
}
- if ($lang->ansi && option 'ansi2knr')
- {
- $full_ansi =~ s/$KNOWN_EXTENSIONS_PATTERN$/\$U$&/;
- $obj_sans_ext .= '$U';
- }
-
my @specifics = ($full_ansi, $obj_sans_ext,
# Only use $this_obj_ext in the derived
# source case because in the other case we
@@ -2005,7 +1869,7 @@ sub handle_single_transform ($$$$$%)
address@hidden, %transform]);
}
}
- elsif ($extension eq $nonansi_obj)
+ elsif ($extension eq $obj)
{
# This is probably the result of a direct suffix rule.
# In this case we just accept the rewrite.
@@ -2523,8 +2387,7 @@ sub check_canonical_spelling
# Set up the compile suite.
sub handle_compile ()
{
- return
- unless $get_object_extension_was_run;
+ return if ! $must_handle_compiled_objects;
# Boilerplate.
my $default_includes = '';
@@ -2573,38 +2436,6 @@ sub handle_compile ()
'DISTRMS' => join ("\n", @dist_rms)));
$output_vars .= $vars;
$output_rules .= "$coms$rules";
-
- # Check for automatic de-ANSI-fication.
- if (option 'ansi2knr')
- {
- my ($ansi2knr_filename, $ansi2knr_where) = @{option 'ansi2knr'};
- my $ansi2knr_dir = '';
-
- require_variables ($ansi2knr_where, "option `ansi2knr' is used",
- TRUE, "ANSI2KNR", "U");
-
- # topdir is where ansi2knr should be.
- if ($ansi2knr_filename eq 'ansi2knr')
- {
- # Only require ansi2knr files if they should appear in
- # this directory.
- require_file ($ansi2knr_where, FOREIGN,
- 'ansi2knr.c', 'ansi2knr.1');
-
- # ansi2knr needs to be built before subdirs, so unshift it
- # rather then pushing it.
- unshift (@all, '$(ANSI2KNR)');
- }
- else
- {
- $ansi2knr_dir = dirname ($ansi2knr_filename);
- }
-
- $output_rules .= &file_contents ('ansi2knr',
- new Automake::Location,
- 'ANSI2KNR-DIR' => $ansi2knr_dir);
-
- }
}
# handle_libtool ()
@@ -2645,6 +2476,7 @@ sub handle_programs
'bin', 'sbin', 'libexec', 'pkglibexec',
'noinst', 'check');
return if ! @proglist;
+ $must_handle_compiled_objects = 1;
my $seen_global_libobjs =
var ('LDADD') && &handle_lib_objects ('', 'LDADD');
@@ -2654,7 +2486,7 @@ sub handle_programs
my ($where, $one_file) = @$pair;
my $seen_libobjs = 0;
- my $obj = get_object_extension '.$(OBJEXT)';
+ my $obj = '.$(OBJEXT)';
$known_programs{$one_file} = $where;
@@ -2735,6 +2567,7 @@ sub handle_libraries
my @liblist = &am_install_var ('libs', 'LIBRARIES',
'lib', 'pkglib', 'noinst', 'check');
return if ! @liblist;
+ $must_handle_compiled_objects = 1;
my @prefix = am_primary_prefixes ('LIBRARIES', 0, 'lib', 'pkglib',
'noinst', 'check');
@@ -2771,7 +2604,7 @@ sub handle_libraries
$where->push_context ("while processing library `$onelib'");
$where->set (INTERNAL->get);
- my $obj = get_object_extension '.$(OBJEXT)';
+ my $obj = '.$(OBJEXT)';
# Canonicalize names and check for misspellings.
my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_SOURCES',
@@ -2840,6 +2673,7 @@ sub handle_ltlibraries
my @liblist = &am_install_var ('ltlib', 'LTLIBRARIES',
'noinst', 'lib', 'pkglib', 'check');
return if ! @liblist;
+ $must_handle_compiled_objects = 1;
my @prefix = am_primary_prefixes ('LTLIBRARIES', 0, 'lib', 'pkglib',
'noinst', 'check');
@@ -2936,7 +2770,7 @@ sub handle_ltlibraries
my ($where, $onelib) = @$pair;
my $seen_libobjs = 0;
- my $obj = get_object_extension '.lo';
+ my $obj = '.lo';
# Canonicalize names and check for misspellings.
my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_LDFLAGS',
@@ -5798,13 +5632,7 @@ sub lang_sub_obj
# Rewrite a single C source file.
sub lang_c_rewrite
{
- my ($directory, $base, $ext, $nonansi_obj, $have_per_exec_flags, $var) = @_;
-
- if (option 'ansi2knr' && $base =~ /_$/)
- {
- # FIXME: include line number in error.
- err_am "C source file `$base.c' would be deleted by ansi2knr rules";
- }
+ my ($directory, $base, $ext, $obj, $have_per_exec_flags, $var) = @_;
my $r = LANG_PROCESS;
if (option 'subdir-objects')
@@ -5821,24 +5649,14 @@ sub lang_c_rewrite
. "`AM_PROG_CC_C_O' in `$configure_ac'",
uniq_scope => US_GLOBAL,
uniq_part => 'AM_PROG_CC_C_O subdir')
- unless $seen_cc_c_o || $nonansi_obj eq '.lo';
+ unless $seen_cc_c_o || $obj eq '.lo';
}
-
- # In this case we already have the directory information, so
- # don't add it again.
- $de_ansi_files{$base} = '';
- }
- else
- {
- $de_ansi_files{$base} = (($directory eq '.' || $directory eq '')
- ? ''
- : "$directory/");
}
if (! $seen_cc_c_o
&& $have_per_exec_flags
&& ! option 'subdir-objects'
- && $nonansi_obj ne '.lo')
+ && $obj ne '.lo')
{
msg_var ('portability',
$var, "compiling `$base.c' with per-target flags requires "
@@ -5977,59 +5795,6 @@ sub lang_java_rewrite
# language, etc. A finish function is only called if a source file of
# the appropriate type has been seen.
-sub lang_c_finish
-{
- # Push all libobjs files onto de_ansi_files. We actually only
- # push files which exist in the current directory, and which are
- # genuine source files.
- foreach my $file (keys %libsources)
- {
- if ($file =~ /^(.*)\.[cly]$/ && -f "$relative_dir/$file")
- {
- $de_ansi_files{$1} = ''
- }
- }
-
- if (option 'ansi2knr' && keys %de_ansi_files)
- {
- # Make all _.c files depend on their corresponding .c files.
- my @objects;
- foreach my $base (sort keys %de_ansi_files)
- {
- # Each _.c file must depend on ansi2knr; otherwise it
- # might be used in a parallel build before it is built.
- # We need to support files in the srcdir and in the build
- # dir (because these files might be auto-generated. But
- # we can't use $< -- some makes only define $< during a
- # suffix rule.
- my $ansfile = $de_ansi_files{$base} . $base . '.c';
- $output_rules .= ($base . "_.c: $ansfile \$(ANSI2KNR)\n\t"
- . '$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) '
- . '`if test -f $(srcdir)/' . $ansfile
- . '; then echo $(srcdir)/' . $ansfile
- . '; else echo ' . $ansfile . '; fi` '
- . "| sed 's/^# \\([0-9]\\)/#line \\1/' "
- . '| $(ANSI2KNR) > $@'
- # If ansi2knr fails then we shouldn't
- # create the _.c file
- . " || rm -f address@hidden");
- push (@objects, $base . '_.$(OBJEXT)');
- push (@objects, $base . '_.lo')
- if var ('LIBTOOL');
-
- # Explicitly clean the _.c files if they are in a
- # subdirectory. (In the current directory they get erased
- # by a `rm -f *_.c' rule.)
- $clean_files{$base . '_.c'} = MOSTLY_CLEAN
- if dirname ($base) ne '.';
- }
-
- # Make all _.o (and _.lo) files depend on ansi2knr.
- # Use a sneaky little hack to make it print nicely.
- &pretty_print_rule ('', '', @objects, ':', '$(ANSI2KNR)');
- }
-}
-
sub lang_vala_finish_target ($$)
{
my ($self, $name) = @_;
@@ -6339,8 +6104,6 @@ sub register_language (%)
my (%option) = @_;
# Set the defaults.
- $option{'ansi'} = 0
- unless defined $option{'ansi'};
$option{'autodep'} = 'no'
unless defined $option{'autodep'};
$option{'linker'} = ''
diff --git a/bootstrap b/bootstrap
index d289bdf..9fab5f8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -103,10 +103,11 @@ dosubst m4/amversion.in m4/amversion.m4
# Create temporary replacement for automake.
dosubst automake.in automake.tmp
-# Create required makefile snippets.
+# Create required makefile snippet.
cd tests
-$BOOTSTRAP_SHELL ./gen-parallel-tests > parallel-tests.am
-$BOOTSTRAP_SHELL ./gen-config-shell-tests > config-shell-tests.am
+$BOOTSTRAP_SHELL ./gen-wrap-tests > wrap-tests.tmp
+chmod a-w wrap-tests.tmp
+mv -f wrap-tests.tmp wrap-tests.am
cd ..
# Run the autotools.
diff --git a/doc/automake.texi b/doc/automake.texi
index ca54999..400a9f1 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -233,7 +233,6 @@ Building Programs and Libraries
* Java Support:: Compiling Java sources
* Vala Support:: Compiling Vala sources
* Support for Other Languages:: Compiling other languages
-* ANSI:: Automatic de-ANSI-fication (deprecated, soon
to be removed)
* Dependencies:: Automatic dependency tracking
* EXEEXT:: Support for executable extensions
@@ -1846,14 +1845,30 @@ supported. This operator appends its right hand
argument to the variable
specified on the left. Automake will translate the operator into
an ordinary @samp{=} operator; @samp{+=} will thus work with any make program.
address@hidden indentation
-Further note that variable assignments should not be indented with
address@hidden characters, use spaces if necessary. On the other hand,
-rule commands should be indented with a leading @key{TAB} character.
-
Automake tries to keep comments grouped with any adjoining rules or
variable definitions.
address@hidden Limitations of automake parser
address@hidden Automake parser, limitations of
address@hidden indentation in Makefile.am
+Generally, Automake is not particularly smart in the parsing of unusual
+Makefile constructs, so you're advised to avoid fancy constructs or
+``creative'' use of whitespaces.
address@hidden Keep this in sync with doc-parsing-buglets-tabs.test.
+For example, @key{TAB} characters cannot be used between a target name
+and the following address@hidden:}'' character, and variable assignments
+shouldn't be indented with @key{TAB} characters.
address@hidden Keep this in sync with doc-parsing-buglets-colneq-subst.test.
+Also, using more complex macro in target names can cause trouble:
+
address@hidden
+% @kbd{cat Makefile.am}
+$(FOO:=x): bar
+% @kbd{automake}
+Makefile.am:1: bad characters in variable name `$(FOO'
+Makefile.am:1: `:='-style assignments are not portable
address@hidden example
+
@cindex Make targets, overriding
@cindex Make rules, overriding
@cindex Overriding make rules
@@ -2272,12 +2287,6 @@ source in case you need more recent versions.
This is a wrapper primarily for the Microsoft lib archiver, to make
it more POSIX-like.
address@hidden ansi2knr.c
address@hidden ansi2knr.1
-These two files are used for de-ANSI-fication support (they are
-deprecated now, and @emph{will be removed} in the next major Automake
-release; @pxref{ANSI}).
-
@item compile
This is a wrapper for compilers that do not accept options @option{-c}
and @option{-o} at the same time. It is only used when absolutely
@@ -3091,11 +3100,6 @@ this way, e.g., @code{AC_PATH_XTRA} defines
@code{X_CFLAGS} and
@code{$(X_CFLAGS)} and @code{$(X_LIBS)} in any @file{Makefile.am}
if @code{AC_PATH_XTRA} is called.
address@hidden AM_C_PROTOTYPES
-This is required when using the deprecated de-ANSI-fication feature;
address@hidden @emph{It will be removed} in the next major Automake
-release.
-
@item AM_CONDITIONAL
This introduces an Automake conditional (@pxref{Conditionals}).
@@ -4051,17 +4055,6 @@ automatically (@pxref{autoupdate Invocation, , Using
Autoconf Manual}).
@table @code
address@hidden AM_C_PROTOTYPES
address@hidden AM_C_PROTOTYPES
address@hidden ANSI2KNR
address@hidden U
-Check to see if function prototypes are understood by the compiler. If
-so, define @samp{PROTOTYPES} and set the output variables @code{U} and
address@hidden to the empty string. Otherwise, set @code{U} to
address@hidden and @code{ANSI2KNR} to @samp{./ansi2knr}. Automake used these
-values to implement the deprecated de-ANSI-fication feature; however,
-support for @emph{that feature will be removed} in the next major Automake
-release, and then @emph{these macros and variables will go away as well}.
@item AM_CONFIG_HEADER
@acindex AM_CONFIG_HEADER
@@ -4673,7 +4666,6 @@ to build programs and libraries.
* Java Support:: Compiling Java sources
* Vala Support:: Compiling Vala sources
* Support for Other Languages:: Compiling other languages
-* ANSI:: Automatic de-ANSI-fication (deprecated, soon
to be removed)
* Dependencies:: Automatic dependency tracking
* EXEEXT:: Support for executable extensions
@end menu
@@ -6852,85 +6844,6 @@ languages, support for which will be improved based on
user demand.
Some limited support for adding your own languages is available via the
suffix rule handling (@pxref{Suffixes}).
-
address@hidden ANSI
address@hidden Automatic de-ANSI-fication (deprecated, soon to be removed)
-
address@hidden de-ANSI-fication, defined
-
address@hidden features described in this section are deprecated; you must
-not use any of them in new code, and remove their use from older but
-still maintained code: they will be withdrawn in the next major
-Automake release.}
-
-When the C language was standardized in 1989, there was a long
-transition period where package developers needed to worry about
-porting to older systems that did not support ANSI C by default.
-These older systems are no longer in practical use and are no longer
-supported by their original suppliers, so developers need not worry
-about this problem any more.
-
-Automake allows you to write packages that are portable to K&R C by
address@hidden each source file before the actual compilation takes
-place.
-
address@hidden AUTOMAKE_OPTIONS
address@hidden ansi2knr
-
-If the @file{Makefile.am} variable @code{AUTOMAKE_OPTIONS}
-(@pxref{Options}) contains the option @option{ansi2knr} then code to
-handle de-ANSI-fication is inserted into the generated
address@hidden
-
-This causes each C source file in the directory to be treated as ANSI
address@hidden
-If an ANSI C compiler is available, it is used. If no ANSI C compiler
-is available, the @command{ansi2knr} program is used to convert the source
-files into K&R C, which is then compiled.
-
-The @command{ansi2knr} program is simple-minded. It assumes the source
-code will be formatted in a particular way; see the @command{ansi2knr} man
-page for details.
-
address@hidden AM_C_PROTOTYPES
-Support for the obsolete de-ANSI-fication feature
-requires the source files @file{ansi2knr.c}
-and @file{ansi2knr.1} to be in the same package as the ANSI C source;
-these files are distributed with Automake. Also, the package
address@hidden must call the macro @code{AM_C_PROTOTYPES}
-(@pxref{Macros}).
-
-Automake also handles finding the @command{ansi2knr} support files in some
-other directory in the current package. This is done by prepending the
-relative path to the appropriate directory to the @command{ansi2knr}
-option. For instance, suppose the package has ANSI C code in the
address@hidden and @file{lib} subdirectories. The files @file{ansi2knr.c} and
address@hidden appear in @file{lib}. Then this could appear in
address@hidden/Makefile.am}:
-
address@hidden
-AUTOMAKE_OPTIONS = ../lib/ansi2knr
address@hidden example
-
-If no directory prefix is given, the files are assumed to be in the
-current directory.
-
-Note that automatic de-ANSI-fication will not work when the package is
-being built for a different host architecture. That is because
address@hidden currently has no way to build @command{ansi2knr}
-for the build machine.
-
address@hidden FIXME: this paragraph might be better moved to an `upgrading'
section.
address@hidden @code{LTLIBOBJS} and @code{ansi2knr}
address@hidden @code{LIBOBJS} and @code{ansi2knr}
address@hidden @code{ansi2knr} and @code{LTLIBOBJS}
address@hidden @code{ansi2knr} and @code{LIBOBJS}
-Using @code{LIBOBJS} with source de-ANSI-fication used to require
-hand-crafted code in @file{configure} to append @samp{$U} to basenames
-in @code{LIBOBJS}. This is no longer true today. Starting with version
-2.54, Autoconf takes care of rewriting @code{LIBOBJS} and
address@hidden (@pxref{AC_LIBOBJ vs LIBOBJS, , @code{AC_LIBOBJ}
-vs.@: @code{LIBOBJS}, autoconf, The Autoconf Manual})
-
@node Dependencies
@section Automatic dependency tracking
@@ -10055,20 +9968,6 @@ then @samp{portability} warnings will be
@emph{disabled} in
Set the strictness as appropriate. The @option{gnits} option also
implies options @option{readme-alpha} and @option{check-news}.
address@hidden @option{ansi2knr}
address@hidden @address@hidden/ansi2knr}
address@hidden Option, @option{ansi2knr}
address@hidden ansi2knr
-Turn on the deprecated de-ANSI-fication feature (@pxref{ANSI}). Note
-that that feature and this option @emph{will be removed} in the next
-major Automake release.
-
-If preceded by a
-path, the generated @file{Makefile.in} will look in the specified
-directory to find the @file{ansi2knr} program. The path should be a
-relative path to another directory in the same distribution (Automake
-does not check this).
-
@item @option{check-news}
@cindex Option, @option{check-news}
@opindex check-news
@@ -14299,7 +14198,7 @@ parentheses is the number of generated test cases.
@c LocalWords: xs emph FIXME ref vindex pkglibdir pkgincludedir pkgdatadir mt
@c LocalWords: pkg libdir cpio bindir sbindir rmt pax sbin zar zardir acindex
@c LocalWords: HTML htmldir html noinst TEXINFOS nodist nobase strudel CFLAGS
address@hidden LocalWords: libmumble CC YFLAGS ansi knr itemx de fication
config url comp
address@hidden LocalWords: libmumble CC YFLAGS itemx de fication config url
comp
@c LocalWords: depcomp elisp sh mdate mkinstalldirs mkdir py tex dvi ps pdf
@c LocalWords: ylwrap zardoz INIT gettext acinclude mv FUNCS LIBOBJS LDADD fr
@c LocalWords: uref featureful dnl src LINGUAS es ko nl pl sl sv PROG ISC doc
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index e8765fd..6836157 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -71,8 +71,7 @@ F<Makefile.am>s.
=cut
-# Values are the Automake::Location of the definition, except
-# for 'ansi2knr' whose value is a pair [filename, Location].
+# Values are the Automake::Location of the definition.
use vars '%_options'; # From AUTOMAKE_OPTIONS
use vars '%_global_options'; # from AM_INIT_AUTOMAKE or the command line.
@@ -269,14 +268,9 @@ sub _process_option_list (\%@)
}
elsif (/^(.*\/)?ansi2knr$/)
{
- # This feature is deprecated, will be removed in the next
- # Automake major release.
- msg 'obsolete', $where,
- "automatic de-ANSI-fication support is deprecated\n";
- # An option like "../lib/ansi2knr" is allowed. With no
- # path prefix, we assume the required programs are in this
- # directory. We save the actual option for later.
- $options->{'ansi2knr'} = [$_, $where];
+ # Obsolete (and now removed) de-ANSI-fication support.
+ error ($where,
+ "automatic de-ANSI-fication support has been removed");
}
elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
|| $_ eq 'dist-shar' || $_ eq 'dist-zip'
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 24d8be0..cd57877 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -156,7 +156,6 @@ my %_gen_varname_n = ();
# Macros accessible via aclocal.
my %_am_macro_for_var =
(
- ANSI2KNR => 'AM_C_PROTOTYPES',
CCAS => 'AM_PROG_AS',
CCASFLAGS => 'AM_PROG_AS',
EMACS => 'AM_PATH_LISPDIR',
@@ -169,7 +168,6 @@ my %_am_macro_for_var =
pyexecdir => 'AM_PATH_PYTHON',
PYTHON => 'AM_PATH_PYTHON',
pythondir => 'AM_PATH_PYTHON',
- U => 'AM_C_PROTOTYPES',
);
# Macros shipped with Autoconf.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bc234ee..237fe61 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,8 +20,7 @@
SUBDIRS = Automake am
-dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
- config-ml.in
+dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex config-ml.in
## These must all be executable when installed. However, if we use
## _SCRIPTS, then the program transform will be applied, which is not
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 769446f..d99ecfc 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -53,9 +53,9 @@ host_triplet = @host@
subdir = lib
DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING INSTALL \
- ansi2knr.1 ansi2knr.c ar-lib compile config.guess config.sub \
- depcomp elisp-comp install-sh mdate-sh missing mkinstalldirs \
- py-compile texinfo.tex ylwrap
+ ar-lib compile config.guess config.sub depcomp elisp-comp \
+ install-sh mdate-sh missing mkinstalldirs py-compile \
+ texinfo.tex ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
@@ -241,9 +241,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = Automake am
-dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
- config-ml.in
-
+dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex config-ml.in
scriptdir = $(pkgvdatadir)
dist_script_DATA = \
config.guess \
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index a255f70..037a4ae 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -3,7 +3,7 @@
## Makefile for Automake lib/am.
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 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
@@ -21,7 +21,6 @@
amdir = $(pkgvdatadir)/am
dist_am_DATA = \
-ansi2knr.am \
check.am \
check2.am \
clean-hdr.am \
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 35e5471..9bbecb9 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -16,7 +16,7 @@
@SET_MAKE@
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 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
@@ -199,7 +199,6 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
amdir = $(pkgvdatadir)/am
dist_am_DATA = \
-ansi2knr.am \
check.am \
check2.am \
clean-hdr.am \
diff --git a/lib/am/ansi2knr.am b/lib/am/ansi2knr.am
deleted file mode 100644
index c4e1990..0000000
--- a/lib/am/ansi2knr.am
+++ /dev/null
@@ -1,77 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2008, 2009
-## 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/>.
-
-## %ANSI2KNR-DIR% is the directory where ansi2knr is, `' if
-## is the current directory.
-
-
-## ---------- ##
-## ansi2knr. ##
-## ---------- ##
-
-if %?ANSI2KNR-DIR%
-
-ANSI2KNR = %ANSI2KNR-DIR%/ansi2knr
-%ANSI2KNR-DIR%/ansi2knr:
- $(am__cd) %ANSI2KNR-DIR% && $(MAKE) $(AM_MAKEFLAGS) ./ansi2knr
-.MAKE: %ANSI2KNR-DIR%/ansi2knr
-
-else !%?ANSI2KNR-DIR%
-
-## Substitution from AM_C_PROTOTYPES. This makes it be built only when
-## necessary.
-ANSI2KNR = @ANSI2KNR@
-./ansi2knr: ansi2knr.$(OBJEXT)
- $(LINK) ansi2knr.$(OBJEXT) $(LIBS)
-ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
-
-endif !%?ANSI2KNR-DIR%
-
-
-## ------------------- ##
-## Cleaning ansi2knr. ##
-## ------------------- ##
-
-
-if !%?ANSI2KNR-DIR%
-.PHONY: clean-krextra
-
-clean-am: clean-krextra
-clean-krextra:
-## Why `clean' and not somewhere else? Not `mostlyclean' because
-## people usually don't want to recompile this file. And not
-## `distclean' because of our informal rule: if `make' built it, then
-## `clean' should delete it; if `configure' built it, then `distclean'
-## should remove it (and if the maintainer built it, then
-## maintainer-clean should remove it).
- -rm -f ansi2knr
-endif !%?ANSI2KNR-DIR%
-
-
-
-## --------------------------------- ##
-## Cleaning the output of ansi2knr. ##
-## --------------------------------- ##
-
-.PHONY: mostlyclean-kr
-
-mostlyclean-am: mostlyclean-kr
-mostlyclean-kr:
-## Only delete *_.c when ansi2knr is actually in use, so as to avoid
-## deleting sources that happen to end in "_" after being truncated on a DOS
-## 8.3 filesystem with srcdir==builddir.
- -test "$U" = "" || rm -f *_.c
diff --git a/lib/ansi2knr.1 b/lib/ansi2knr.1
deleted file mode 100644
index f9ee5a6..0000000
--- a/lib/ansi2knr.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH ANSI2KNR 1 "19 Jan 1996"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-[--varargs] input_file [output_file]
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes function definitions by seeing a non-keyword identifier at the left
-margin, followed by a left parenthesis, with a right parenthesis as the last
-character on the line, and with a left brace as the first token on the
-following line (ignoring possible intervening comments). It will recognize a
-multi-line header provided that no intervening line ends with a left or right
-brace or a semicolon. These algorithms ignore whitespace and comments, except
-that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
- - Any other construct that starts at the left margin and follows the
-above syntax (such as a macro or function call).
-.br
- - Some macros that tinker with the syntax of the function header.
-.sp
-The --varargs switch is obsolete, and is recognized only for
-backwards compatibility. The present version of
-.I ansi2knr
-will always attempt to convert a ... argument to va_alist and va_dcl.
-.SH AUTHOR
-L. Peter Deutsch <address@hidden> wrote the original ansi2knr and
-continues to maintain the current version; most of the code in the current
-version is his work. ansi2knr also includes contributions by Francois
-Pinard <address@hidden> and Jim Avera <address@hidden>.
diff --git a/lib/ansi2knr.c b/lib/ansi2knr.c
deleted file mode 100644
index e84c210..0000000
--- a/lib/ansi2knr.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/* Copyright (C) 1989, 2000 Aladdin Enterprises. All rights reserved. */
-
-/*$Id: ansi2knr.c,v 1.14 2003/09/06 05:36:56 eggert Exp $*/
-/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY. No author or distributor accepts responsibility to anyone for the
-consequences of using it or for whether it serves any particular purpose or
-works at all, unless he says so in writing. Refer to the GNU General Public
-License (the "GPL") for full details.
-
-Everyone is granted permission to copy, modify and redistribute ansi2knr,
-but only under the conditions described in the GPL. A copy of this license
-is supposed to have been given to you along with ansi2knr so you can know
-your rights and responsibilities. It should be in a file named COPYLEFT,
-or, if there is no file named COPYLEFT, a file named COPYING. Among other
-things, the copyright notice and this notice must be preserved on all
-copies.
-
-We explicitly state here what we believe is already implied by the GPL: if
-the ansi2knr program is distributed as a separate set of sources and a
-separate executable file which are aggregated on a storage medium together
-with another program, this in itself does not bring the other program under
-the GPL, nor does the mere fact that such a program or the procedures for
-constructing it invoke the ansi2knr executable bring any other part of the
-program under the GPL.
-*/
-
-/*
- * Usage:
- ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]
- * --filename provides the file name for the #line directive in the output,
- * overriding input_file (if present).
- * If no input_file is supplied, input is read from stdin.
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis, with a
- * right parenthesis as the last character on the line, and with a left
- * brace as the first token on the following line (ignoring possible
- * intervening comments and/or preprocessor directives), except that a line
- * consisting of only
- * identifier1(identifier2)
- * will not be considered a function definition unless identifier2 is
- * the word "void", and a line consisting of
- * identifier1(identifier2, <<arbitrary>>)
- * will not be considered a function definition.
- * ansi2knr will recognize a multi-line header provided that no intervening
- * line ends with a left or right brace or a semicolon. These algorithms
- * ignore whitespace, comments, and preprocessor directives, except that
- * the function name must be the first thing on the line. The following
- * constructs will confuse it:
- * - Any other construct that starts at the left margin and
- * follows the above syntax (such as a macro or function call).
- * - Some macros that tinker with the syntax of function headers.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * <address@hidden>. Other authors are noted in the change history
- * that follows (in reverse chronological order):
-
- lpd 2000-04-12 backs out Eggert's changes because of bugs:
- - concatlits didn't declare the type of its bufend argument;
- - concatlits didn't recognize when it was inside a comment;
- - scanstring could scan backward past the beginning of the string; when
- - the check for \ + newline in scanstring was unnecessary.
-
- 2000-03-05 Paul Eggert <address@hidden>
-
- Add support for concatenated string literals.
- * ansi2knr.c (concatlits): New decl.
- (main): Invoke concatlits to concatenate string literals.
- (scanstring): Handle backslash-newline correctly. Work with
- character constants. Fix bug when scanning backwards through
- backslash-quote. Check for unterminated strings.
- (convert1): Parse character constants, too.
- (appendline, concatlits): New functions.
- * ansi2knr.1: Document this.
-
- lpd 1999-08-17 added code to allow preprocessor directives
- wherever comments are allowed
- lpd 1999-04-12 added minor fixes from Pavel Roskin
- <address@hidden> for clean compilation with
- gcc -W -Wall
- lpd 1999-03-22 added hack to recognize lines consisting of
- identifier1(identifier2, xxx) as *not* being procedures
- lpd 1999-02-03 made indentation of preprocessor commands consistent
- lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
- endless loop; quoted strings within an argument list
- confused the parser
- lpd 1999-01-24 added a check for write errors on the output,
- suggested by Jim Meyering <address@hidden>
- lpd 1998-11-09 added further hack to recognize identifier(void)
- as being a procedure
- lpd 1998-10-23 added hack to recognize lines consisting of
- identifier1(identifier2) as *not* being procedures
- lpd 1997-12-08 made input_file optional; only closes input and/or
- output file if not stdin or stdout respectively; prints
- usage message on stderr rather than stdout; adds
- --filename switch (changes suggested by
- <address@hidden>)
- lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with
- compilers that don't understand void, as suggested by
- Tom Lane
- lpd 1996-01-15 changed to require that the first non-comment token
- on the line following a function header be a left brace,
- to reduce sensitivity to macros, as suggested by Tom Lane
- <address@hidden>
- lpd 1995-06-22 removed #ifndefs whose sole purpose was to define
- undefined preprocessor symbols as 0; changed all #ifdefs
- for configuration symbols to #ifs
- lpd 1995-04-05 changed copyright notice to make it clear that
- including ansi2knr in a program does not bring the entire
- program under the GPL
- lpd 1994-12-18 added conditionals for systems where ctype macros
- don't handle 8-bit characters properly, suggested by
- Francois Pinard <address@hidden>;
- removed --varargs switch (this is now the default)
- lpd 1994-10-10 removed CONFIG_BROKETS conditional
- lpd 1994-07-16 added some conditionals to help GNU `configure',
- suggested by Francois Pinard <address@hidden>;
- properly erase prototype args in function parameters,
- contributed by Jim Avera <address@hidden>;
- correct error in writeblanks (it shouldn't erase EOLs)
- lpd 1989-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* or without the GNU configure machinery. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#if HAVE_CONFIG_H
-
-/*
- For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
- This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/* Otherwise do it the hard way */
-
-# ifdef BSD
-# include <strings.h>
-# else
-# ifdef VMS
- extern int strlen(), strncmp();
-# else
-# include <string.h>
-# endif
-# endif
-
-#endif /* not HAVE_CONFIG_H */
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-/*
- malloc and free should be declared in stdlib.h,
- but if you've got a K&R compiler, they probably aren't.
- */
-# ifdef MSDOS
-# include <malloc.h>
-# else
-# ifdef VMS
- extern char *malloc();
- extern void free();
-# else
- extern char *malloc();
- extern int free();
-# endif
-# endif
-
-#endif
-
-/* Define NULL (for *very* old compilers). */
-#ifndef NULL
-# define NULL (0)
-#endif
-
-/*
- * The ctype macros don't always handle 8-bit characters correctly.
- * Compensate for this here.
- */
-#ifdef isascii
-# undef HAVE_ISASCII /* just in case */
-# define HAVE_ISASCII 1
-#else
-#endif
-#if STDC_HEADERS || !HAVE_ISASCII
-# define is_ascii(c) 1
-#else
-# define is_ascii(c) isascii(c)
-#endif
-
-#define is_space(c) (is_ascii(c) && isspace(c))
-#define is_alpha(c) (is_ascii(c) && isalpha(c))
-#define is_alnum(c) (is_ascii(c) && isalnum(c))
-
-/* Scanning macros */
-#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *ppdirforward();
-char *ppdirbackward();
-char *skipspace();
-char *scanstring();
-int writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
- int argc;
- char *argv[];
-{ FILE *in = stdin;
- FILE *out = stdout;
- char *filename = 0;
- char *program_name = argv[0];
- char *output_name = 0;
-#define bufsize 5000 /* arbitrary size */
- char *buf;
- char *line;
- char *more;
- char *usage =
- "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n";
- /*
- * In previous versions, ansi2knr recognized a --varargs switch.
- * If this switch was supplied, ansi2knr would attempt to convert
- * a ... argument to va_alist and va_dcl; if this switch was not
- * supplied, ansi2knr would simply drop any such arguments.
- * Now, ansi2knr always does this conversion, and we only
- * check for this switch for backward compatibility.
- */
- int convert_varargs = 1;
- int output_error;
-
- while ( argc > 1 && argv[1][0] == '-' ) {
- if ( !strcmp(argv[1], "--varargs") ) {
- convert_varargs = 1;
- argc--;
- argv++;
- continue;
- }
- if ( !strcmp(argv[1], "--filename") && argc > 2 ) {
- filename = argv[2];
- argc -= 2;
- argv += 2;
- continue;
- }
- fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
- argv[1]);
- fprintf(stderr, usage);
- exit(1);
- }
- switch ( argc )
- {
- default:
- fprintf(stderr, usage);
- exit(0);
- case 3:
- output_name = argv[2];
- out = fopen(output_name, "w");
- if ( out == NULL ) {
- fprintf(stderr, "%s: Cannot open output file %s\n",
- program_name, output_name);
- exit(1);
- }
- /* falls through */
- case 2:
- in = fopen(argv[1], "r");
- if ( in == NULL ) {
- fprintf(stderr, "%s: Cannot open input file %s\n",
- program_name, argv[1]);
- exit(1);
- }
- if ( filename == 0 )
- filename = argv[1];
- /* falls through */
- case 1:
- break;
- }
- if ( filename )
- fprintf(out, "#line 1 \"%s\"\n", filename);
- buf = malloc(bufsize);
- if ( buf == NULL )
- {
- fprintf(stderr, "Unable to allocate read buffer!\n");
- exit(1);
- }
- line = buf;
- while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
- {
-test: line += strlen(line);
- switch ( test1(buf) )
- {
- case 2: /* a function header */
- convert1(buf, out, 1, convert_varargs);
- break;
- case 1: /* a function */
- /* Check for a { at the start of the next line. */
- more = ++line;
-f: if ( line >= buf + (bufsize - 1) ) /* overflow check */
- goto wl;
- if ( fgets(line, (unsigned)(buf + bufsize - line), in)
== NULL )
- goto wl;
- switch ( *skipspace(ppdirforward(more), 1) )
- {
- case '{':
- /* Definitely a function header. */
- convert1(buf, out, 0, convert_varargs);
- fputs(more, out);
- break;
- case 0:
- /* The next line was blank or a comment: */
- /* keep scanning for a non-comment. */
- line += strlen(line);
- goto f;
- default:
- /* buf isn't a function header, but */
- /* more might be. */
- fputs(buf, out);
- strcpy(buf, more);
- line = buf;
- goto test;
- }
- break;
- case -1: /* maybe the start of a function */
- if ( line != buf + (bufsize - 1) ) /* overflow check */
- continue;
- /* falls through */
- default: /* not a function */
-wl: fputs(buf, out);
- break;
- }
- line = buf;
- }
- if ( line != buf )
- fputs(buf, out);
- free(buf);
- if ( output_name ) {
- output_error = ferror(out);
- output_error |= fclose(out);
- } else { /* out == stdout */
- fflush(out);
- output_error = ferror(out);
- }
- if ( output_error ) {
- fprintf(stderr, "%s: error writing to %s\n", program_name,
- (output_name ? output_name : "stdout"));
- exit(1);
- }
- if ( in != stdin )
- fclose(in);
- return 0;
-}
-
-/*
- * Skip forward or backward over one or more preprocessor directives.
- */
-char *
-ppdirforward(p)
- char *p;
-{
- for (; *p == '#'; ++p) {
- for (; *p != '\r' && *p != '\n'; ++p)
- if (*p == 0)
- return p;
- if (*p == '\r' && p[1] == '\n')
- ++p;
- }
- return p;
-}
-char *
-ppdirbackward(p, limit)
- char *p;
- char *limit;
-{
- char *np = p;
-
- for (;; p = --np) {
- if (*np == '\n' && np[-1] == '\r')
- --np;
- for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
- if (np[-1] == 0)
- return np;
- if (*np != '#')
- return p;
- }
-}
-
-/*
- * Skip over whitespace, comments, and preprocessor directives,
- * in either direction.
- */
-char *
-skipspace(p, dir)
- char *p;
- int dir; /* 1 for forward, -1 for backward */
-{
- for ( ; ; ) {
- while ( is_space(*p) )
- p += dir;
- if ( !(*p == '/' && p[dir] == '*') )
- break;
- p += dir; p += dir;
- while ( !(*p == '*' && p[dir] == '/') ) {
- if ( *p == 0 )
- return p; /* multi-line comment?? */
- p += dir;
- }
- p += dir; p += dir;
- }
- return p;
-}
-
-/* Scan over a quoted string, in either direction. */
-char *
-scanstring(p, dir)
- char *p;
- int dir;
-{
- for (p += dir; ; p += dir)
- if (*p == '"' && p[-dir] != '\\')
- return p + dir;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-int
-writeblanks(start, end)
- char *start;
- char *end;
-{ char *p;
- for ( p = start; p < end; p++ )
- if ( *p != '\r' && *p != '\n' )
- *p = ' ';
- return 0;
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- * 0 - definitely not a function definition;
- * 1 - definitely a function definition;
- * 2 - definitely a function prototype (NOT USED);
- * -1 - may be the beginning of a function definition,
- * append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
- char *buf;
-{ char *p = buf;
- char *bend;
- char *endfn;
- int contin;
-
- if ( !isidfirstchar(*p) )
- return 0; /* no name at left margin */
- bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
- switch ( *bend )
- {
- case ';': contin = 0 /*2*/; break;
- case ')': contin = 1; break;
- case '{': return 0; /* not a function */
- case '}': return 0; /* not a function */
- default: contin = -1;
- }
- while ( isidchar(*p) )
- p++;
- endfn = p;
- p = skipspace(p, 1);
- if ( *p++ != '(' )
- return 0; /* not a function */
- p = skipspace(p, 1);
- if ( *p == ')' )
- return 0; /* no parameters */
- /* Check that the apparent function name isn't a keyword. */
- /* We only need to check for keywords that could be followed */
- /* by a left parenthesis (which, unfortunately, is most of them). */
- { static char *words[] =
- { "asm", "auto", "case", "char", "const", "double",
- "extern", "float", "for", "if", "int", "long",
- "register", "return", "short", "signed", "sizeof",
- "static", "switch", "typedef", "unsigned",
- "void", "volatile", "while", 0
- };
- char **key = words;
- char *kp;
- unsigned len = endfn - buf;
-
- while ( (kp = *key) != 0 )
- { if ( strlen(kp) == len && !strncmp(kp, buf, len) )
- return 0; /* name is a keyword */
- key++;
- }
- }
- {
- char *id = p;
- int len;
- /*
- * Check for identifier1(identifier2) and not
- * identifier1(void), or identifier1(identifier2, xxxx).
- */
-
- while ( isidchar(*p) )
- p++;
- len = p - id;
- p = skipspace(p, 1);
- if (*p == ',' ||
- (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
- )
- return 0; /* not a function */
- }
- /*
- * If the last significant character was a ), we need to count
- * parentheses, because it might be part of a formal parameter
- * that is a procedure.
- */
- if (contin > 0) {
- int level = 0;
-
- for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1))
- level += (*p == '(' ? 1 : *p == ')' ? -1 : 0);
- if (level > 0)
- contin = -1;
- }
- return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
- char *buf;
- FILE *out;
- int header; /* Boolean */
- int convert_varargs; /* Boolean */
-{ char *endfn;
- char *p;
- /*
- * The breaks table contains pointers to the beginning and end
- * of each argument.
- */
- char **breaks;
- unsigned num_breaks = 2; /* for testing */
- char **btop;
- char **bp;
- char **ap;
- char *vararg = 0;
-
- /* Pre-ANSI implementations don't agree on whether strchr */
- /* is called strchr or index, so we open-code it here. */
- for ( endfn = buf; *(endfn++) != '('; )
- ;
-top: p = endfn;
- breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
- if ( breaks == NULL )
- { /* Couldn't allocate break table, give up */
- fprintf(stderr, "Unable to allocate break table!\n");
- fputs(buf, out);
- return -1;
- }
- btop = breaks + num_breaks * 2 - 2;
- bp = breaks;
- /* Parse the argument list */
- do
- { int level = 0;
- char *lp = NULL;
- char *rp = NULL;
- char *end = NULL;
-
- if ( bp >= btop )
- { /* Filled up break table. */
- /* Allocate a bigger one and start over. */
- free((char *)breaks);
- num_breaks <<= 1;
- goto top;
- }
- *bp++ = p;
- /* Find the end of the argument */
- for ( ; end == NULL; p++ )
- { switch(*p)
- {
- case ',':
- if ( !level ) end = p;
- break;
- case '(':
- if ( !level ) lp = p;
- level++;
- break;
- case ')':
- if ( --level < 0 ) end = p;
- else rp = p;
- break;
- case '/':
- if (p[1] == '*')
- p = skipspace(p, 1) - 1;
- break;
- case '"':
- p = scanstring(p, 1) - 1;
- break;
- default:
- ;
- }
- }
- /* Erase any embedded prototype parameters. */
- if ( lp && rp )
- writeblanks(lp + 1, rp);
- p--; /* back up over terminator */
- /* Find the name being declared. */
- /* This is complicated because of procedure and */
- /* array modifiers. */
- for ( ; ; )
- { p = skipspace(p - 1, -1);
- switch ( *p )
- {
- case ']': /* skip array dimension(s) */
- case ')': /* skip procedure args OR name */
- { int level = 1;
- while ( level )
- switch ( *--p )
- {
- case ']': case ')':
- level++;
- break;
- case '[': case '(':
- level--;
- break;
- case '/':
- if (p > buf && p[-1] == '*')
- p = skipspace(p, -1) + 1;
- break;
- case '"':
- p = scanstring(p, -1) + 1;
- break;
- default: ;
- }
- }
- if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
- { /* We found the name being declared */
- while ( !isidfirstchar(*p) )
- p = skipspace(p, 1) + 1;
- goto found;
- }
- break;
- default:
- goto found;
- }
- }
-found: if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
- { if ( convert_varargs )
- { *bp++ = "va_alist";
- vararg = p-2;
- }
- else
- { p++;
- if ( bp == breaks + 1 ) /* sole argument */
- writeblanks(breaks[0], p);
- else
- writeblanks(bp[-1] - 1, p);
- bp--;
- }
- }
- else
- { while ( isidchar(*p) ) p--;
- *bp++ = p+1;
- }
- p = end;
- }
- while ( *p++ == ',' );
- *bp = p;
- /* Make a special check for 'void' arglist */
- if ( bp == breaks+2 )
- { p = skipspace(breaks[0], 1);
- if ( !strncmp(p, "void", 4) )
- { p = skipspace(p+4, 1);
- if ( p == breaks[2] - 1 )
- { bp = breaks; /* yup, pretend arglist is
empty */
- writeblanks(breaks[0], p + 1);
- }
- }
- }
- /* Put out the function name and left parenthesis. */
- p = buf;
- while ( p != endfn ) putc(*p, out), p++;
- /* Put out the declaration. */
- if ( header )
- { fputs(");", out);
- for ( p = breaks[0]; *p; p++ )
- if ( *p == '\r' || *p == '\n' )
- putc(*p, out);
- }
- else
- { for ( ap = breaks+1; ap < bp; ap += 2 )
- { p = *ap;
- while ( isidchar(*p) )
- putc(*p, out), p++;
- if ( ap < bp - 1 )
- fputs(", ", out);
- }
- fputs(") ", out);
- /* Put out the argument declarations */
- for ( ap = breaks+2; ap <= bp; ap += 2 )
- (*ap)[-1] = ';';
- if ( vararg != 0 )
- { *vararg = 0;
- fputs(breaks[0], out); /* any prior args */
- fputs("va_dcl", out); /* the final arg */
- fputs(bp[0], out);
- }
- else
- fputs(breaks[0], out);
- }
- free((char *)breaks);
- return 0;
-}
diff --git a/m4/depout.m4 b/m4/depout.m4
index 80a3926..3e046cd 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -44,15 +44,13 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
diff --git a/m4/protos.m4 b/m4/protos.m4
index f710293..32a5616 100644
--- a/m4/protos.m4
+++ b/m4/protos.m4
@@ -1,31 +1,16 @@
-## ------------------------------- ## -*- Autoconf -*-
-## Check for function prototypes. ##
-## From Franc,ois Pinard ##
-## ------------------------------- ##
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
+# -*- Autoconf -*-
+# Obsolete (and now removed) automatic de-ANSI-fiction support.
+#
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006, 2011
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
AC_DEFUN([AM_C_PROTOTYPES],
-[AC_REQUIRE([AC_C_PROTOTYPES])
-AC_DIAGNOSE([obsolete],
- [$0: automatic de-ANSI-fication support is deprecated])
-if test "$ac_cv_prog_cc_stdc" != no; then
- U= ANSI2KNR=
-else
- U=_ ANSI2KNR=./ansi2knr
-fi
-# Ensure some checks needed by ansi2knr itself.
-AC_REQUIRE([AC_HEADER_STDC])
-AC_CHECK_HEADERS([string.h])
-AC_SUBST([U])dnl
-AC_SUBST([ANSI2KNR])dnl
-_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
-])
+ [AC_FATAL([automatic de-ANSI-fication support has been removed])])
AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/tests/.gitignore b/tests/.gitignore
index 4ec56b1..528a0f5 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,8 +1,7 @@
/aclocal-*
/automake-*
/defs-static
-/parallel-tests.am
-/config-shell-tests.am
+/wrap-tests.am
/*.dir
/*.log
/*.trs
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ce37884..d166f25 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,9 +36,11 @@ AM_TAP_LOG_DRIVER_FLAGS = --merge --comments
## Keep this in sync with the definition of $diag_string_ in tests/defs.
AM_TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf '\043%%\043\n'`
-MAINTAINERCLEANFILES =
EXTRA_DIST = ChangeLog-old
+## Will be updated later.
+TESTS =
+
XFAIL_TESTS = \
all.test \
cond17.test \
@@ -48,41 +50,6 @@ pr8365-remake-timing.test \
yacc-dist-nobuild-subdir.test \
txinfo5.test
-
-include $(srcdir)/parallel-tests.am
-
-$(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
- $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
-EXTRA_DIST += gen-parallel-tests
-
-TEST_EXTENSIONS += .ptest
-PTEST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/parallel-tests.sh
-EXTRA_DIST += parallel-tests.sh
-
-# All `*-p.ptest' tests work by sourcing the script `parallel-tests.sh'.
-$(parallel_tests:.ptest=.log): parallel-tests.sh
-# This dummy declaration is required to have make actually produce
-# expected log files from the `.ptest.log' suffix rule.
-$(parallel_tests):
-
-
-include $(srcdir)/config-shell-tests.am
-
-$(srcdir)/config-shell-tests.am: gen-config-shell-tests Makefile.am
- $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-config-shell-tests)
>$@
-EXTRA_DIST += gen-config-shell-tests
-
-TEST_EXTENSIONS += .shtst
-SHTST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/config-shell-tests.sh
-EXTRA_DIST += config-shell-tests.sh
-
-# All `*-w.shtst' tests work by sourcing the script `config-shell-tests.sh'.
-$(config_shell_tests:.shtst=.log): config-shell-tests.sh
-# This dummy declaration is required to have make actually produce
-# expected log files from the `.shtst.log' suffix rule.
-$(config_shell_tests):
-
-
# Some testsuite-influential variables should be overridable from the
# test scripts, but not from the environment.
AM_TESTS_ENVIRONMENT = \
@@ -103,1038 +70,33 @@ AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC=no; export
AM_TESTS_REEXEC;
AM_TESTS_FD_REDIRECT = 9>&2
AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
-TESTS = \
- $(handwritten_tests) \
- $(config_shell_tests) \
- $(parallel_tests)
+# Hand-written tests.
-EXTRA_DIST += $(handwritten_tests)
+include $(srcdir)/list-of-tests.mk
-handwritten_tests = \
-## This tests might quite a long time, since they run various checks
-## sequentially; so place them early first to improve performance on
-## concurrent testsuite runs.
-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 \
-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-deprecation.test \
-ansi.test \
-ansi2.test \
-ansi3.test \
-ansi3b.test \
-ansi4.test \
-ansi5.test \
-ansi6.test \
-ansi7.test \
-ansi8.test \
-ansi9.test \
-ansi10.test \
-ar-lib.test \
-ar.test \
-ar2.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 \
-cxxansi.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 \
-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 \
-discover.test \
-dist-included-parent-dir.test \
-distcleancheck.test \
-distcom2.test \
-distcom3.test \
-distcom4.test \
-distcom5.test \
-distcom6.test \
-distcom7.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 \
-dmalloc.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 \
-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 \
-interp.test \
-interp2.test \
-java.test \
-java2.test \
-java3.test \
-java-check.test \
-java-empty-classpath.test \
-javaprim.test \
-javasubst.test \
-java-extra.test \
-java-noinst.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 \
-libobj8.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 \
-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 \
-mkinstall.test \
-mkinst2.test \
-mkinst3.test \
-mmode.test \
-mmodely.test \
-multlib.test \
-no-outdir-option.test \
-nobase.test \
-nobase-libtool.test \
-nobase-python.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-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.test \
-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-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-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.test \
-primary-prefix-valid-couples.test \
-primary-prefix-couples-force-valid.test \
-primary-prefix-couples-documented-valid.test \
-proginst.test \
-programs-primary-rewritten.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.test \
-self-check-dir.test \
-self-check-env-sanitize.tap \
-self-check-exit.tap \
-self-check-explicit-skips.test \
-self-check-is_newest.test \
-self-check-me.tap \
-self-check-reexec.test \
-self-check-report.test \
-self-check-sanity.test \
-self-check-seq.test \
-self-check-tap.test \
-self-check-unindent.test \
-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 \
-subobj3.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 \
-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_with_common_setup_tests) \
-$(tap_other_tests) \
-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 \
-unused.test \
-upc.test \
-upc2.test \
-upc3.test \
-vala.test \
-vala1.test \
-vala2.test \
-vala3.test \
-vala4.test \
-vala5.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
+TESTS += $(handwritten_TESTS)
+EXTRA_DIST += $(handwritten_TESTS)
-## Files containing auxiliary functions used by our test cases.
-EXTRA_DIST += tap-functions.sh plain-functions.sh
+# "Auto-generated" tests wrapping hand-written ones.
+
+include $(srcdir)/wrap-tests.am
+
+TESTS += $(wrap_TESTS)
+
+$(srcdir)/wrap-tests.am: gen-wrap-tests list-of-tests.mk Makefile.am
+ $(AM_V_GEN)($(am__cd) $(srcdir) \
+ && $(SHELL) ./gen-wrap-tests) > wrap-tests.tmp
+ $(AM_V_at)chmod a-w wrap-tests.tmp && mv -f wrap-tests.tmp $@
+EXTRA_DIST += gen-wrap-tests
+
+# These tests are not expected to exist on filesystem, so we need this
+# declaration to avoid spurious failures.
+$(wrap_TESTS):
+# All the "wrapper" tests work by sourcing the script `wrap-tests.sh'.
+$(wrap_LOGS): wrap-tests.sh
+EXTRA_DIST += wrap-tests.sh
+
+# Extra dependencies for hand-written tests.
test-driver-custom-multitest.log: trivial-test-driver
test-driver-custom-multitest-recheck.log: trivial-test-driver
@@ -1150,103 +112,9 @@ EXTRA_DIST += extract-testsuite-summary
testsuite-summary-count-many.log: trivial-test-driver
testsuite-summary-count-many.log: extract-testsuite-summary
-# List of tests on TAP support that use the files pre-computed by
-# `tap-common-setup.test', and sources the `tap-setup.sh' helper
-# script.
-tap_with_common_setup_tests = \
-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.test \
-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
-
-# Their log files.
-tap_with_common_setup_logs = $(tap_with_common_setup_tests:.test=.log)
-
-# Their dependencies.
-$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh
+$(tap_with_common_setup_TESTS:.test=.log): tap-common-setup.log tap-setup.sh
EXTRA_DIST += tap-setup.sh
-# Other tests on TAP support.
-tap_other_tests = \
-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
-
tap-summary.log tap-summary-color.log: tap-summary-aux.sh
EXTRA_DIST += tap-summary-aux.sh
@@ -1267,7 +135,7 @@ check-local: check-no-repeated-test-name
## Checking the list of tests.
checked_test_extensions = .test .tap
-expected_list_of_tests = $(handwritten_tests)
+expected_list_of_tests = $(handwritten_TESTS)
include $(top_srcdir)/CheckListOfTests.am
# Dependencies valid for each test case.
@@ -1276,6 +144,9 @@ $(TEST_LOGS): defs defs-static aclocal-$(APIVERSION)
automake-$(APIVERSION)
# subdivision of the tests.
$(TEST_LOGS): plain-functions.sh tap-functions.sh
+## Files containing auxiliary functions used by our test cases.
+EXTRA_DIST += tap-functions.sh plain-functions.sh
+
clean-local: clean-local-check
.PHONY: clean-local-check
clean-local-check:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 42c6b23..21ee6ad 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -50,10 +50,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/aclocal.in $(srcdir)/automake.in \
- $(srcdir)/config-shell-tests.am $(srcdir)/defs \
- $(srcdir)/defs-static.in $(srcdir)/parallel-tests.am \
- $(top_srcdir)/CheckListOfTests.am
+ $(srcdir)/aclocal.in $(srcdir)/automake.in $(srcdir)/defs \
+ $(srcdir)/defs-static.in $(srcdir)/list-of-tests.mk \
+ $(srcdir)/wrap-tests.am $(top_srcdir)/CheckListOfTests.am
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
@@ -185,14 +184,18 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER)
$(AM_TEST_LOG_FLAGS) \
am__test_logs3 = $(am__test_logs2:.tap.log=.log)
TAP_LOG_COMPILE = $(TAP_LOG_COMPILER) $(AM_TAP_LOG_FLAGS) \
$(TAP_LOG_FLAGS)
-am__test_logs4 = $(am__test_logs3:.ptest.log=.log)
-PTEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/lib/test-driver
-PTEST_LOG_COMPILE = $(PTEST_LOG_COMPILER) $(AM_PTEST_LOG_FLAGS) \
- $(PTEST_LOG_FLAGS)
-TEST_LOGS = $(am__test_logs4:.shtst.log=.log)
-SHTST_LOG_DRIVER = $(SHELL) $(top_srcdir)/lib/test-driver
-SHTST_LOG_COMPILE = $(SHTST_LOG_COMPILER) $(AM_SHTST_LOG_FLAGS) \
- $(SHTST_LOG_FLAGS)
+am__test_logs4 = $(am__test_logs3:.test_pt.log=.log)
+TEST_PT_LOG_COMPILE = $(TEST_PT_LOG_COMPILER) $(AM_TEST_PT_LOG_FLAGS) \
+ $(TEST_PT_LOG_FLAGS)
+am__test_logs5 = $(am__test_logs4:.test_cs.log=.log)
+TEST_CS_LOG_COMPILE = $(TEST_CS_LOG_COMPILER) $(AM_TEST_CS_LOG_FLAGS) \
+ $(TEST_CS_LOG_FLAGS)
+am__test_logs6 = $(am__test_logs5:.test_pltap.log=.log)
+TEST_PLTAP_LOG_COMPILE = $(TEST_PLTAP_LOG_COMPILER) \
+ $(AM_TEST_PLTAP_LOG_FLAGS) $(TEST_PLTAP_LOG_FLAGS)
+TEST_LOGS = $(am__test_logs6:.tap_pltap.log=.log)
+TAP_PLTAP_LOG_COMPILE = $(TAP_PLTAP_LOG_COMPILER) \
+ $(AM_TAP_PLTAP_LOG_FLAGS) $(TAP_PLTAP_LOG_FLAGS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -295,18 +298,21 @@ top_srcdir = @top_srcdir@
# Run the tests with the shell detected at configure time.
LOG_COMPILER = $(SHELL)
-TEST_EXTENSIONS = .test .tap .ptest .shtst
+TEST_EXTENSIONS = .test .tap .test_pt .test_cs .test_pltap .tap_pltap
TEST_LOG_COMPILER = $(LOG_COMPILER)
TAP_LOG_COMPILER = $(LOG_COMPILER)
TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
AM_TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string \
`printf '\043%%\043\n'`
-MAINTAINERCLEANFILES =
-EXTRA_DIST = ChangeLog-old gen-parallel-tests parallel-tests.sh \
- gen-config-shell-tests config-shell-tests.sh \
- $(handwritten_tests) tap-functions.sh plain-functions.sh \
- trivial-test-driver testsuite-summary-checks.sh \
- extract-testsuite-summary tap-setup.sh tap-summary-aux.sh
+EXTRA_DIST = ChangeLog-old $(handwritten_TESTS) gen-wrap-tests \
+ wrap-tests.sh trivial-test-driver testsuite-summary-checks.sh \
+ extract-testsuite-summary tap-setup.sh tap-summary-aux.sh \
+ tap-functions.sh plain-functions.sh
+
+# Hand-written tests.
+
+# "Auto-generated" tests wrapping hand-written ones.
+TESTS = $(handwritten_TESTS) $(wrap_TESTS)
XFAIL_TESTS = \
all.test \
cond17.test \
@@ -316,22 +322,6 @@ pr8365-remake-timing.test \
yacc-dist-nobuild-subdir.test \
txinfo5.test
-parallel_tests = check-concurrency-bug9245-p.ptest \
- check-exported-srcdir-p.ptest check-fd-redirect-p.ptest \
- check-subst-prog-p.ptest check-subst-p.ptest \
- check-tests-in-builddir-p.ptest check-p.ptest check11-p.ptest \
- check12-p.ptest check2-p.ptest check3-p.ptest check4-p.ptest \
- check5-p.ptest check6-p.ptest check7-p.ptest check8-p.ptest \
- color-p.ptest color2-p.ptest comment9-p.ptest dejagnu-p.ptest \
- exeext4-p.ptest maken3-p.ptest maken4-p.ptest \
- posixsubst-tests-p.ptest tests-environment-p.ptest
-PTEST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/parallel-tests.sh
-config_shell_tests = ar-lib-w.shtst compile-w.shtst compile2-w.shtst \
- compile3-w.shtst compile4-w.shtst compile5-w.shtst \
- compile6-w.shtst instsh2-w.shtst instsh3-w.shtst \
- mdate5-w.shtst mdate6-w.shtst missing-w.shtst missing2-w.shtst \
- missing3-w.shtst missing5-w.shtst mkinst3-w.shtst
-SHTST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/config-shell-tests.sh
# Some testsuite-influential variables should be overridable from the
# test scripts, but not from the environment.
@@ -350,12 +340,12 @@ AM_TESTS_ENVIRONMENT = test x"$$me" = x || unset me; test
\
# We want warning messages and explanations for skipped tests to go to
# the console if possible, so set up `stderr_fileno_' properly.
AM_TESTS_FD_REDIRECT = 9>&2
-TESTS = \
- $(handwritten_tests) \
- $(config_shell_tests) \
- $(parallel_tests)
-handwritten_tests = \
+# 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 \
@@ -400,18 +390,7 @@ amopt.test \
amopts-location.test \
amopts-variable-expansion.test \
amsubst.test \
-ansi2knr-deprecation.test \
-ansi.test \
-ansi2.test \
-ansi3.test \
-ansi3b.test \
-ansi4.test \
-ansi5.test \
-ansi6.test \
-ansi7.test \
-ansi8.test \
-ansi9.test \
-ansi10.test \
+ansi2knr-no-more.test \
ar-lib.test \
ar.test \
ar2.test \
@@ -601,7 +580,6 @@ cscope2.test \
cscope3.test \
cxx.test \
cxx2.test \
-cxxansi.test \
cxxcpp.test \
cxxlibobj.test \
cxxlink.test \
@@ -664,6 +642,8 @@ distcheck-configure-flags-subpkg.test \
distcheck-hook.test \
distcheck-hook2.test \
dmalloc.test \
+doc-parsing-buglets-colneq-subst.test \
+doc-parsing-buglets-tabs.test \
dollar.test \
dollarvar.test \
dollarvar2.test \
@@ -814,7 +794,6 @@ libobj3.test \
libobj4.test \
libobj5.test \
libobj7.test \
-libobj8.test \
libobj10.test \
libobj12.test \
libobj13.test \
@@ -914,6 +893,7 @@ mkinst3.test \
mmode.test \
mmodely.test \
multlib.test \
+no-extra-makefile-code.test \
no-outdir-option.test \
nobase.test \
nobase-libtool.test \
@@ -1220,7 +1200,6 @@ subcond2.test \
subcond3.test \
subobj.test \
subobj2.test \
-subobj3.test \
subobj4.test \
subobj5.test \
subobj6.test \
@@ -1263,8 +1242,8 @@ suffix-chain.tap \
symlink.test \
symlink2.test \
syntax.test \
-$(tap_with_common_setup_tests) \
-$(tap_other_tests) \
+$(tap_with_common_setup_TESTS) \
+$(tap_other_TESTS) \
tags.test \
tags2.test \
tagsub.test \
@@ -1318,6 +1297,7 @@ vala2.test \
vala3.test \
vala4.test \
vala5.test \
+vala-vpath.test \
vars.test \
vars3.test \
vartar.test \
@@ -1377,9 +1357,9 @@ yflags-var-expand.test
# List of tests on TAP support that use the files pre-computed by
-# `tap-common-setup.test', and sources the `tap-setup.sh' helper
+# `tap-common-setup.test', and source the `tap-setup.sh' helper
# script.
-tap_with_common_setup_tests = \
+tap_with_common_setup_TESTS = \
tap-ambiguous-directive.test \
tap-autonumber.test \
tap-bailout.test \
@@ -1452,11 +1432,8 @@ tap-with-and-without-number.test \
tap-xfail-tests.test
-# Their log files.
-tap_with_common_setup_logs = $(tap_with_common_setup_tests:.test=.log)
-
# Other tests on TAP support.
-tap_other_tests = \
+tap_other_TESTS = \
tap-common-setup.test \
tap-bad-prog.tap \
tap-basic.test \
@@ -1470,16 +1447,180 @@ tap-recheck.test \
tap-summary.test \
tap-summary-color.test
+wrap_TESTS = check-concurrency-bug9245-w.test_pt \
+ check-exported-srcdir-w.test_pt check-fd-redirect-w.test_pt \
+ check-subst-prog-w.test_pt check-subst-w.test_pt \
+ check-tests-in-builddir-w.test_pt check-w.test_pt \
+ check11-w.test_pt check12-w.test_pt check2-w.test_pt \
+ check3-w.test_pt check4-w.test_pt check5-w.test_pt \
+ check6-w.test_pt check7-w.test_pt check8-w.test_pt \
+ color-w.test_pt color2-w.test_pt comment9-w.test_pt \
+ dejagnu-w.test_pt exeext4-w.test_pt maken3-w.test_pt \
+ maken4-w.test_pt posixsubst-tests-w.test_pt \
+ tests-environment-w.test_pt ar-lib-w.test_cs compile-w.test_cs \
+ compile2-w.test_cs compile3-w.test_cs compile4-w.test_cs \
+ compile5-w.test_cs compile6-w.test_cs instsh2-w.test_cs \
+ instsh3-w.test_cs mdate5-w.test_cs mdate6-w.test_cs \
+ missing-w.test_cs missing2-w.test_cs missing3-w.test_cs \
+ missing5-w.test_cs mkinst3-w.test_cs \
+ tap-ambiguous-directive-w.test_pltap \
+ tap-autonumber-w.test_pltap tap-bad-prog-w.tap_pltap \
+ tap-bailout-and-logging-w.test_pltap \
+ tap-bailout-suppress-badexit-w.test_pltap \
+ tap-bailout-suppress-later-diagnostic-w.test_pltap \
+ tap-bailout-suppress-later-errors-w.test_pltap \
+ tap-bailout-w.test_pltap tap-basic-w.test_pltap \
+ tap-color-w.test_pltap tap-deps-w.test_pltap \
+ tap-diagnostic-custom-w.test_pltap tap-diagnostic-w.test_pltap \
+ tap-doc-w.test_pltap tap-driver-stderr-w.test_pltap \
+ tap-empty-diagnostic-w.test_pltap tap-empty-w.test_pltap \
+ tap-escape-directive-2-w.test_pltap \
+ tap-escape-directive-w.test_pltap tap-exit-w.test_pltap \
+ tap-fancy-w.test_pltap tap-fancy2-w.test_pltap \
+ tap-global-log-w.test_pltap tap-global-result-w.test_pltap \
+ tap-html-w.test_pltap tap-log-w.test_pltap \
+ tap-merge-stdout-stderr-w.test_pltap \
+ tap-missing-plan-and-bad-exit-w.test_pltap \
+ tap-more-w.test_pltap tap-more2-w.test_pltap \
+ tap-msg0-bailout-w.test_pltap tap-msg0-directive-w.test_pltap \
+ tap-msg0-misc-w.test_pltap tap-msg0-planskip-w.test_pltap \
+ tap-msg0-result-w.test_pltap tap-negative-numbers-w.test_pltap \
+ tap-no-disable-hard-error-w.test_pltap \
+ tap-no-merge-stdout-stderr-w.test_pltap \
+ tap-no-spurious-numbers-w.test_pltap \
+ tap-no-spurious-summary-w.test_pltap \
+ tap-no-spurious-w.test_pltap tap-not-ok-skip-w.test_pltap \
+ tap-number-wordboundary-w.test_pltap \
+ tap-numbers-leading-zero-w.test_pltap \
+ tap-numeric-description-w.test_pltap \
+ tap-out-of-order-w.test_pltap \
+ tap-passthrough-exit-w.test_pltap tap-passthrough-w.test_pltap \
+ tap-plan-corner-w.test_pltap tap-plan-errors-w.test_pltap \
+ tap-plan-leading-zero-w.test_pltap \
+ tap-plan-malformed-w.test_pltap tap-plan-middle-w.test_pltap \
+ tap-plan-whitespace-w.test_pltap tap-plan-w.test_pltap \
+ tap-planskip-and-logging-w.test_pltap \
+ tap-planskip-badexit-w.test_pltap \
+ tap-planskip-bailout-w.test_pltap \
+ tap-planskip-case-insensitive-w.test_pltap \
+ tap-planskip-late-w.test_pltap \
+ tap-planskip-later-errors-w.test_pltap \
+ tap-planskip-unplanned-corner-w.test_pltap \
+ tap-planskip-unplanned-w.test_pltap \
+ tap-planskip-whitespace-w.test_pltap tap-planskip-w.test_pltap \
+ tap-realtime-w.test_pltap tap-recheck-logs-w.test_pltap \
+ tap-recheck-w.test_pltap tap-result-comment-w.test_pltap \
+ tap-signal-w.test_pltap tap-test-number-0-w.test_pltap \
+ tap-todo-skip-together-w.test_pltap \
+ tap-todo-skip-whitespace-w.test_pltap \
+ tap-todo-skip-w.test_pltap tap-unplanned-w.test_pltap \
+ tap-whitespace-normalization-w.test_pltap \
+ tap-with-and-without-number-w.test_pltap \
+ tap-xfail-tests-w.test_pltap
+wrap_LOGS = check-concurrency-bug9245-w.log \
+ check-exported-srcdir-w.log check-fd-redirect-w.log \
+ check-subst-prog-w.log check-subst-w.log \
+ check-tests-in-builddir-w.log check-w.log check11-w.log \
+ check12-w.log check2-w.log check3-w.log check4-w.log \
+ check5-w.log check6-w.log check7-w.log check8-w.log \
+ color-w.log color2-w.log comment9-w.log dejagnu-w.log \
+ exeext4-w.log maken3-w.log maken4-w.log posixsubst-tests-w.log \
+ tests-environment-w.log ar-lib-w.log compile-w.log \
+ compile2-w.log compile3-w.log compile4-w.log compile5-w.log \
+ compile6-w.log instsh2-w.log instsh3-w.log mdate5-w.log \
+ mdate6-w.log missing-w.log missing2-w.log missing3-w.log \
+ missing5-w.log mkinst3-w.log tap-ambiguous-directive-w.log \
+ tap-autonumber-w.log tap-bad-prog-w.log \
+ tap-bailout-and-logging-w.log \
+ tap-bailout-suppress-badexit-w.log \
+ tap-bailout-suppress-later-diagnostic-w.log \
+ tap-bailout-suppress-later-errors-w.log tap-bailout-w.log \
+ tap-basic-w.log tap-color-w.log tap-deps-w.log \
+ tap-diagnostic-custom-w.log tap-diagnostic-w.log tap-doc-w.log \
+ tap-driver-stderr-w.log tap-empty-diagnostic-w.log \
+ tap-empty-w.log tap-escape-directive-2-w.log \
+ tap-escape-directive-w.log tap-exit-w.log tap-fancy-w.log \
+ tap-fancy2-w.log tap-global-log-w.log tap-global-result-w.log \
+ tap-html-w.log tap-log-w.log tap-merge-stdout-stderr-w.log \
+ tap-missing-plan-and-bad-exit-w.log tap-more-w.log \
+ tap-more2-w.log tap-msg0-bailout-w.log \
+ tap-msg0-directive-w.log tap-msg0-misc-w.log \
+ tap-msg0-planskip-w.log tap-msg0-result-w.log \
+ tap-negative-numbers-w.log tap-no-disable-hard-error-w.log \
+ tap-no-merge-stdout-stderr-w.log tap-no-spurious-numbers-w.log \
+ tap-no-spurious-summary-w.log tap-no-spurious-w.log \
+ tap-not-ok-skip-w.log tap-number-wordboundary-w.log \
+ tap-numbers-leading-zero-w.log tap-numeric-description-w.log \
+ tap-out-of-order-w.log tap-passthrough-exit-w.log \
+ tap-passthrough-w.log tap-plan-corner-w.log \
+ tap-plan-errors-w.log tap-plan-leading-zero-w.log \
+ tap-plan-malformed-w.log tap-plan-middle-w.log \
+ tap-plan-whitespace-w.log tap-plan-w.log \
+ tap-planskip-and-logging-w.log tap-planskip-badexit-w.log \
+ tap-planskip-bailout-w.log tap-planskip-case-insensitive-w.log \
+ tap-planskip-late-w.log tap-planskip-later-errors-w.log \
+ tap-planskip-unplanned-corner-w.log \
+ tap-planskip-unplanned-w.log tap-planskip-whitespace-w.log \
+ tap-planskip-w.log tap-realtime-w.log tap-recheck-logs-w.log \
+ tap-recheck-w.log tap-result-comment-w.log tap-signal-w.log \
+ tap-test-number-0-w.log tap-todo-skip-together-w.log \
+ tap-todo-skip-whitespace-w.log tap-todo-skip-w.log \
+ tap-unplanned-w.log tap-whitespace-normalization-w.log \
+ tap-with-and-without-number-w.log tap-xfail-tests-w.log
+TEST_PT_LOG_DRIVER = \
+ $(TEST_LOG_DRIVER)
+
+AM_TEST_PT_LOG_DRIVER_FLAGS = \
+ $(AM_TEST_LOG_DRIVER_FLAGS) \
+ $(TEST_LOG_DRIVER_FLAGS)
+
+TEST_PT_LOG_COMPILER = \
+ $(LOG_COMPILER) $(srcdir)/wrap-tests.sh \
+ --type pt --define parallel_tests "yes"
+
+TEST_CS_LOG_DRIVER = \
+ $(TEST_LOG_DRIVER)
+
+AM_TEST_CS_LOG_DRIVER_FLAGS = \
+ $(AM_TEST_LOG_DRIVER_FLAGS) \
+ $(TEST_LOG_DRIVER_FLAGS)
+
+TEST_CS_LOG_COMPILER = \
+ $(LOG_COMPILER) $(srcdir)/wrap-tests.sh \
+ --type cs --define test_prefer_config_shell "yes"
+
+TEST_PLTAP_LOG_DRIVER = \
+ $(TEST_LOG_DRIVER)
+
+AM_TEST_PLTAP_LOG_DRIVER_FLAGS = \
+ $(AM_TEST_LOG_DRIVER_FLAGS) \
+ $(TEST_LOG_DRIVER_FLAGS)
+
+TEST_PLTAP_LOG_COMPILER = \
+ $(LOG_COMPILER) $(srcdir)/wrap-tests.sh \
+ --type pltap --define am_tap_implementation "perl"
+
+TAP_PLTAP_LOG_DRIVER = \
+ $(TAP_LOG_DRIVER)
+
+AM_TAP_PLTAP_LOG_DRIVER_FLAGS = \
+ $(AM_TAP_LOG_DRIVER_FLAGS) \
+ $(TAP_LOG_DRIVER_FLAGS)
+
+TAP_PLTAP_LOG_COMPILER = \
+ $(LOG_COMPILER) $(srcdir)/wrap-tests.sh \
+ --type pltap --define am_tap_implementation "perl"
+
checked_test_extensions = .test .tap
-expected_list_of_tests = $(handwritten_tests)
+expected_list_of_tests = $(handwritten_TESTS)
am__tmk = tests-in-makefile-list.tmp
am__tfs = tests-on-filesystem-list.tmp
am__tdf = diff-in-tests-lists.tmp
all: all-am
.SUFFIXES:
-.SUFFIXES: .html .log .ptest .shtst .tap .test .trs
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/parallel-tests.am
$(srcdir)/config-shell-tests.am $(top_srcdir)/CheckListOfTests.am
$(am__configure_deps)
+.SUFFIXES: .html .log .tap .tap_pltap .test .test_cs .test_pltap .test_pt .trs
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/list-of-tests.mk
$(srcdir)/wrap-tests.am $(top_srcdir)/CheckListOfTests.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -1714,15 +1855,25 @@ recheck recheck-html:
--log-file '$*.log' --trs-file '$*.trs' \
$(am__common_driver_flags) $(AM_TAP_LOG_DRIVER_FLAGS)
$(TAP_LOG_DRIVER_FLAGS) -- $(TAP_LOG_COMPILE) "$$tst" \
$(AM_TESTS_FD_REDIRECT)
-.ptest.log:
- @p='$<'; $(am__check_pre) $(PTEST_LOG_DRIVER) --test-name "$$f" \
+.test_pt.log:
+ @p='$<'; $(am__check_pre) $(TEST_PT_LOG_DRIVER) --test-name "$$f" \
+ --log-file '$*.log' --trs-file '$*.trs' \
+ $(am__common_driver_flags) $(AM_TEST_PT_LOG_DRIVER_FLAGS)
$(TEST_PT_LOG_DRIVER_FLAGS) -- $(TEST_PT_LOG_COMPILE) "$$tst" \
+ $(AM_TESTS_FD_REDIRECT)
+.test_cs.log:
+ @p='$<'; $(am__check_pre) $(TEST_CS_LOG_DRIVER) --test-name "$$f" \
--log-file '$*.log' --trs-file '$*.trs' \
- $(am__common_driver_flags) $(AM_PTEST_LOG_DRIVER_FLAGS)
$(PTEST_LOG_DRIVER_FLAGS) -- $(PTEST_LOG_COMPILE) "$$tst" \
+ $(am__common_driver_flags) $(AM_TEST_CS_LOG_DRIVER_FLAGS)
$(TEST_CS_LOG_DRIVER_FLAGS) -- $(TEST_CS_LOG_COMPILE) "$$tst" \
$(AM_TESTS_FD_REDIRECT)
-.shtst.log:
- @p='$<'; $(am__check_pre) $(SHTST_LOG_DRIVER) --test-name "$$f" \
+.test_pltap.log:
+ @p='$<'; $(am__check_pre) $(TEST_PLTAP_LOG_DRIVER) --test-name "$$f" \
--log-file '$*.log' --trs-file '$*.trs' \
- $(am__common_driver_flags) $(AM_SHTST_LOG_DRIVER_FLAGS)
$(SHTST_LOG_DRIVER_FLAGS) -- $(SHTST_LOG_COMPILE) "$$tst" \
+ $(am__common_driver_flags) $(AM_TEST_PLTAP_LOG_DRIVER_FLAGS)
$(TEST_PLTAP_LOG_DRIVER_FLAGS) -- $(TEST_PLTAP_LOG_COMPILE) "$$tst" \
+ $(AM_TESTS_FD_REDIRECT)
+.tap_pltap.log:
+ @p='$<'; $(am__check_pre) $(TAP_PLTAP_LOG_DRIVER) --test-name "$$f" \
+ --log-file '$*.log' --trs-file '$*.trs' \
+ $(am__common_driver_flags) $(AM_TAP_PLTAP_LOG_DRIVER_FLAGS)
$(TAP_PLTAP_LOG_DRIVER_FLAGS) -- $(TAP_PLTAP_LOG_COMPILE) "$$tst" \
$(AM_TESTS_FD_REDIRECT)
distdir: $(DISTFILES)
@@ -1794,7 +1945,6 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-generic clean-local mostlyclean-am
@@ -1876,40 +2026,35 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am recheck recheck-html \
uninstall uninstall-am
-check-concurrency-bug9245-p.log: check-concurrency-bug9245.test
-check-exported-srcdir-p.log: check-exported-srcdir.test
-check-fd-redirect-p.log: check-fd-redirect.test
-check-subst-prog-p.log: check-subst-prog.test
-check-subst-p.log: check-subst.test
-check-tests-in-builddir-p.log: check-tests-in-builddir.test
-check-p.log: check.test
-check11-p.log: check11.test
-check12-p.log: check12.test
-check2-p.log: check2.test
-check3-p.log: check3.test
-check4-p.log: check4.test
-check5-p.log: check5.test
-check6-p.log: check6.test
-check7-p.log: check7.test
-check8-p.log: check8.test
-color-p.log: color.test
-color2-p.log: color2.test
-comment9-p.log: comment9.test
-dejagnu-p.log: dejagnu.test
-exeext4-p.log: exeext4.test
-maken3-p.log: maken3.test
-maken4-p.log: maken4.test
-posixsubst-tests-p.log: posixsubst-tests.test
-tests-environment-p.log: tests-environment.test
-
-$(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
- $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
-
-# All `*-p.ptest' tests work by sourcing the script `parallel-tests.sh'.
-$(parallel_tests:.ptest=.log): parallel-tests.sh
-# This dummy declaration is required to have make actually produce
-# expected log files from the `.ptest.log' suffix rule.
-$(parallel_tests):
+
+print-list-of-tests:
+ @echo $(handwritten_TESTS)
+.PHONY: print-list-of-tests
+check-concurrency-bug9245-w.log: check-concurrency-bug9245.test
+check-exported-srcdir-w.log: check-exported-srcdir.test
+check-fd-redirect-w.log: check-fd-redirect.test
+check-subst-prog-w.log: check-subst-prog.test
+check-subst-w.log: check-subst.test
+check-tests-in-builddir-w.log: check-tests-in-builddir.test
+check-w.log: check.test
+check11-w.log: check11.test
+check12-w.log: check12.test
+check2-w.log: check2.test
+check3-w.log: check3.test
+check4-w.log: check4.test
+check5-w.log: check5.test
+check6-w.log: check6.test
+check7-w.log: check7.test
+check8-w.log: check8.test
+color-w.log: color.test
+color2-w.log: color2.test
+comment9-w.log: comment9.test
+dejagnu-w.log: dejagnu.test
+exeext4-w.log: exeext4.test
+maken3-w.log: maken3.test
+maken4-w.log: maken4.test
+posixsubst-tests-w.log: posixsubst-tests.test
+tests-environment-w.log: tests-environment.test
ar-lib-w.log: ar-lib.test
compile-w.log: compile.test
compile2-w.log: compile2.test
@@ -1926,15 +2071,97 @@ missing2-w.log: missing2.test
missing3-w.log: missing3.test
missing5-w.log: missing5.test
mkinst3-w.log: mkinst3.test
-
-$(srcdir)/config-shell-tests.am: gen-config-shell-tests Makefile.am
- $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-config-shell-tests)
>$@
-
-# All `*-w.shtst' tests work by sourcing the script `config-shell-tests.sh'.
-$(config_shell_tests:.shtst=.log): config-shell-tests.sh
-# This dummy declaration is required to have make actually produce
-# expected log files from the `.shtst.log' suffix rule.
-$(config_shell_tests):
+tap-ambiguous-directive-w.log: tap-ambiguous-directive.test
+tap-autonumber-w.log: tap-autonumber.test
+tap-bad-prog-w.log: tap-bad-prog.tap
+tap-bailout-and-logging-w.log: tap-bailout-and-logging.test
+tap-bailout-suppress-badexit-w.log: tap-bailout-suppress-badexit.test
+tap-bailout-suppress-later-diagnostic-w.log:
tap-bailout-suppress-later-diagnostic.test
+tap-bailout-suppress-later-errors-w.log: tap-bailout-suppress-later-errors.test
+tap-bailout-w.log: tap-bailout.test
+tap-basic-w.log: tap-basic.test
+tap-color-w.log: tap-color.test
+tap-deps-w.log: tap-deps.test
+tap-diagnostic-custom-w.log: tap-diagnostic-custom.test
+tap-diagnostic-w.log: tap-diagnostic.test
+tap-doc-w.log: tap-doc.test
+tap-driver-stderr-w.log: tap-driver-stderr.test
+tap-empty-diagnostic-w.log: tap-empty-diagnostic.test
+tap-empty-w.log: tap-empty.test
+tap-escape-directive-2-w.log: tap-escape-directive-2.test
+tap-escape-directive-w.log: tap-escape-directive.test
+tap-exit-w.log: tap-exit.test
+tap-fancy-w.log: tap-fancy.test
+tap-fancy2-w.log: tap-fancy2.test
+tap-global-log-w.log: tap-global-log.test
+tap-global-result-w.log: tap-global-result.test
+tap-html-w.log: tap-html.test
+tap-log-w.log: tap-log.test
+tap-merge-stdout-stderr-w.log: tap-merge-stdout-stderr.test
+tap-missing-plan-and-bad-exit-w.log: tap-missing-plan-and-bad-exit.test
+tap-more-w.log: tap-more.test
+tap-more2-w.log: tap-more2.test
+tap-msg0-bailout-w.log: tap-msg0-bailout.test
+tap-msg0-directive-w.log: tap-msg0-directive.test
+tap-msg0-misc-w.log: tap-msg0-misc.test
+tap-msg0-planskip-w.log: tap-msg0-planskip.test
+tap-msg0-result-w.log: tap-msg0-result.test
+tap-negative-numbers-w.log: tap-negative-numbers.test
+tap-no-disable-hard-error-w.log: tap-no-disable-hard-error.test
+tap-no-merge-stdout-stderr-w.log: tap-no-merge-stdout-stderr.test
+tap-no-spurious-numbers-w.log: tap-no-spurious-numbers.test
+tap-no-spurious-summary-w.log: tap-no-spurious-summary.test
+tap-no-spurious-w.log: tap-no-spurious.test
+tap-not-ok-skip-w.log: tap-not-ok-skip.test
+tap-number-wordboundary-w.log: tap-number-wordboundary.test
+tap-numbers-leading-zero-w.log: tap-numbers-leading-zero.test
+tap-numeric-description-w.log: tap-numeric-description.test
+tap-out-of-order-w.log: tap-out-of-order.test
+tap-passthrough-exit-w.log: tap-passthrough-exit.test
+tap-passthrough-w.log: tap-passthrough.test
+tap-plan-corner-w.log: tap-plan-corner.test
+tap-plan-errors-w.log: tap-plan-errors.test
+tap-plan-leading-zero-w.log: tap-plan-leading-zero.test
+tap-plan-malformed-w.log: tap-plan-malformed.test
+tap-plan-middle-w.log: tap-plan-middle.test
+tap-plan-whitespace-w.log: tap-plan-whitespace.test
+tap-plan-w.log: tap-plan.test
+tap-planskip-and-logging-w.log: tap-planskip-and-logging.test
+tap-planskip-badexit-w.log: tap-planskip-badexit.test
+tap-planskip-bailout-w.log: tap-planskip-bailout.test
+tap-planskip-case-insensitive-w.log: tap-planskip-case-insensitive.test
+tap-planskip-late-w.log: tap-planskip-late.test
+tap-planskip-later-errors-w.log: tap-planskip-later-errors.test
+tap-planskip-unplanned-corner-w.log: tap-planskip-unplanned-corner.test
+tap-planskip-unplanned-w.log: tap-planskip-unplanned.test
+tap-planskip-whitespace-w.log: tap-planskip-whitespace.test
+tap-planskip-w.log: tap-planskip.test
+tap-realtime-w.log: tap-realtime.test
+tap-recheck-logs-w.log: tap-recheck-logs.test
+tap-recheck-w.log: tap-recheck.test
+tap-result-comment-w.log: tap-result-comment.test
+tap-signal-w.log: tap-signal.test
+tap-test-number-0-w.log: tap-test-number-0.test
+tap-todo-skip-together-w.log: tap-todo-skip-together.test
+tap-todo-skip-whitespace-w.log: tap-todo-skip-whitespace.test
+tap-todo-skip-w.log: tap-todo-skip.test
+tap-unplanned-w.log: tap-unplanned.test
+tap-whitespace-normalization-w.log: tap-whitespace-normalization.test
+tap-with-and-without-number-w.log: tap-with-and-without-number.test
+tap-xfail-tests-w.log: tap-xfail-tests.test
+
+$(srcdir)/wrap-tests.am: gen-wrap-tests list-of-tests.mk Makefile.am
+ $(AM_V_GEN)($(am__cd) $(srcdir) \
+ && $(SHELL) ./gen-wrap-tests) > wrap-tests.tmp
+ $(AM_V_at)chmod a-w wrap-tests.tmp && mv -f wrap-tests.tmp $@
+
+# These tests are not expected to exist on filesystem, so we need this
+# declaration to avoid spurious failures.
+$(wrap_TESTS):
+# All the "wrapper" tests work by sourcing the script `wrap-tests.sh'.
+$(wrap_LOGS): wrap-tests.sh
+
+# Extra dependencies for hand-written tests.
test-driver-custom-multitest.log: trivial-test-driver
test-driver-custom-multitest-recheck.log: trivial-test-driver
@@ -1947,8 +2174,7 @@ testsuite-summary-color.log testsuite-summary-count.log: \
testsuite-summary-count-many.log: trivial-test-driver
testsuite-summary-count-many.log: extract-testsuite-summary
-# Their dependencies.
-$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh
+$(tap_with_common_setup_TESTS:.test=.log): tap-common-setup.log tap-setup.sh
tap-summary.log tap-summary-color.log: tap-summary-aux.sh
diff --git a/tests/README b/tests/README
index 54ec670..fb12380 100644
--- a/tests/README
+++ b/tests/README
@@ -184,12 +184,19 @@ Do
instead.
For tests that use the `parallel-tests' Automake option, set the shell
- variable `parallel_tests' to "yes" before including ./defs. Also,
- do not use for them a name that ends in `-p.test', since that would
- risk to clash with automatically-generated tests. For tests that are
- *not* meant to work with the `parallel-tests' Automake option (these
- should be very very few), set the shell variable `parallel_tests' to
- "no" before including ./defs.
+ variable `parallel_tests' to "yes" before including ./defs. For tests
+ that are *not* meant to work with the `parallel-tests' Automake option
+ (these should be very very few), set the shell variable `parallel_tests'
+ to "no" before including ./defs.
+
+ Some tests in the Automake testsuite are auto-generated; those tests
+ might have custom extensions, but their basename (that is, with such
+ extension stripped) is expected to end with the "-w" string. For
+ example, the name of an auto-generated test can be `color-w.ptest'
+ or `ar-lib-w.shtst'. Please don't name hand-written tests in a way
+ that could cause them to be confused with auto-generated tests; for
+ example, `u-v-w.test' or `option-w.tap' are *not* valid name for
+ hand-written tests.
./defs brings in some commonly required files, and sets a skeleton
configure.in. If possible, append to this file. In some cases
diff --git a/tests/ansi.test b/tests/ansi.test
deleted file mode 100755
index 4998055..0000000
--- a/tests/ansi.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 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 <http://www.gnu.org/licenses/>.
-
-# Test for bug where ansi2knr.c is not included in distribution.
-# From François Pinard.
-
-required=cc
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-.PHONY: test1 test2
-test1:
- echo ' $(DISTFILES) ' | grep ' ansi2knr\.c '
- echo ' $(DISTFILES) ' | grep ' ansi2knr\.1 '
-test2: distdir
- test -f $(distdir)/ansi2knr.c
- test -f $(distdir)/ansi2knr.1
-END
-
-cat >> configure.in << 'END'
-AM_C_PROTOTYPES
-AC_OUTPUT
-END
-
-: > ansi2knr.c
-: > ansi2knr.1
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete
-
-./configure
-
-$MAKE test1
-$MAKE test2
-
-:
diff --git a/tests/ansi10.test b/tests/ansi10.test
deleted file mode 100755
index cb04b5a..0000000
--- a/tests/ansi10.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2006, 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 <http://www.gnu.org/licenses/>.
-
-# Make sure ansi2knr works with $(LIBOBJS).
-
-required='cc native'
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_C_PROTOTYPES
-AC_PROG_RANLIB
-AC_LIBOBJ([hello])
-AC_CONFIG_FILES([dir/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = dir
-END
-
-mkdir dir
-
-cat > dir/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-noinst_LIBRARIES = liblib.a
-liblib_a_SOURCES =
-liblib_a_LIBADD = $(LIBOBJS)
-END
-
-cat > dir/hello.c << 'END'
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
- printf ("hello\n");
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-
-# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
-test `grep -c ac_cv_prog_cc_stdc configure` -gt 1
-
-./configure ac_cv_prog_cc_stdc=no
-$MAKE
-test -f dir/hello_.c
-$MAKE distclean
-test ! -f dir/hello_.c
-
-# Also run without forcing ansi2knr, so we make sure the
-# rules work with ANSI compilers.
-./configure
-$MAKE
-test ! -f dir/hello_.c
diff --git a/tests/ansi2.test b/tests/ansi2.test
deleted file mode 100755
index 72bc758..0000000
--- a/tests/ansi2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 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 <http://www.gnu.org/licenses/>.
-
-# Test to make sure ansi2knr built at the right time.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = joe
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-END
-
-: > ansi2knr.c
-: > ansi2knr.1
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in
diff --git a/tests/ansi2knr-deprecation.test b/tests/ansi2knr-deprecation.test
deleted file mode 100755
index c04c6a8..0000000
--- a/tests/ansi2knr-deprecation.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /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 <http://www.gnu.org/licenses/>.
-
-# Check that the use of automatic de-ANSI-fication feature is deprecated.
-# That feature will be removed in the next major Automake release.
-
-. ./defs || Exit 1
-
-warn_rx='automatic de-ANSI-fication.*deprecated'
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-END
-
-$ACLOCAL
-
-$AUTOCONF -Wall -Werror -Wno-obsolete
-$AUTOCONF -Wnone -Wobsolete -Werror 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep "^configure\\.in:5:.* AM_C_PROTOTYPES:.*$warn_rx" stderr
-
-sed '/AM_C_PROTOTYPES/d' configure.in > config.stub
-diff configure.in config.stub && fatal_ "failed to edit configure.in"
-rm -f configure.in
-
-cat > Makefile.stub <<'END'
-ANSI2KNR = :
-U =
-END
-
-for opt in ansi2knr lib/ansi2knr; do
- # ansi2knr option in Makefile.am
- cp config.stub configure.in
- cp Makefile.stub Makefile.am
- echo "AUTOMAKE_OPTIONS = $opt" >> Makefile.am
- cat Makefile.am # For debugging.
- $AUTOMAKE -Wno-obsolete
- AUTOMAKE_fails
- grep "^Makefile\.am:3:.*$warn_rx" stderr
- AUTOMAKE_fails -Wnone -Wobsolete
- grep "^Makefile\.am:3:.*$warn_rx" stderr
- # ansi2knr option in configure.in
- cp Makefile.stub Makefile.am
- sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" config.stub > configure.in
- cat configure.in # For debugging.
- $AUTOMAKE -Wno-obsolete
- AUTOMAKE_fails
- grep "^configure\.in:2:.*$warn_rx" stderr
- AUTOMAKE_fails -Wnone -Wobsolete
- grep "^configure\.in:2:.*$warn_rx" stderr
-done
-
-:
diff --git a/tests/ansi2knr-no-more.test b/tests/ansi2knr-no-more.test
new file mode 100755
index 0000000..0d405fe
--- /dev/null
+++ b/tests/ansi2knr-no-more.test
@@ -0,0 +1,56 @@
+#! /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 <http://www.gnu.org/licenses/>.
+
+# Check that any attempt to use the obsolete de-ANSI-fication support
+# is diagnosed.
+
+. ./defs || Exit 1
+
+warn_rx='automatic de-ANSI-fication.*removed'
+
+echo AC_PROG_CC >> configure.in
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
+cp configure.in configure.sav
+
+echo AM_C_PROTOTYPES >> configure.in
+
+$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep "^configure\\.in:5:.*$warn_rx" stderr
+
+cat aclocal.sav "$top_testsrcdir"/m4/protos.m4 > aclocal.m4
+$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep "^configure\\.in:5:.*$warn_rx" stderr
+
+for opt in ansi2knr lib/ansi2knr; do
+ # ansi2knr option in Makefile.am
+ cp configure.sav configure.in
+ echo "AUTOMAKE_OPTIONS = $opt" > Makefile.am
+ rm -rf autom4te*.cache
+ AUTOMAKE_fails -Wnone
+ grep "^Makefile\.am:1:.*$warn_rx" stderr
+ # ansi2knr option in configure.in
+ echo > Makefile.am # `echo', not `:', for Solaris /bin/sh.
+ sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.in
+ cat configure.in # For debugging.
+ rm -rf autom4te*.cache
+ AUTOMAKE_fails -Wnone
+ grep "^configure\.in:2:.*$warn_rx" stderr
+done
+
+:
diff --git a/tests/ansi3.test b/tests/ansi3.test
deleted file mode 100755
index dccc7f8..0000000
--- a/tests/ansi3.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2003, 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 <http://www.gnu.org/licenses/>.
-
-# Actual test of ansi2knr functionality.
-
-required='cc native'
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr no-dependencies
-bin_PROGRAMS = hello
-END
-
-cat > hello.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
- printf ("yeah, yeah\n");
- return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'Makefile.am:1:.*ansi2knr\.c' stderr
-./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
diff --git a/tests/ansi3b.test b/tests/ansi3b.test
deleted file mode 100755
index df9000f..0000000
--- a/tests/ansi3b.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2003, 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 <http://www.gnu.org/licenses/>.
-
-# Actual test of ansi2knr functionality. Relies on existence
-# of working gcc. Same as ansi3.test, but with AUTOMAKE_OPTIONS
-# defined in configure.in.
-
-required='cc native'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT([hello], [0.24])
-AM_INIT_AUTOMAKE([ansi2knr no-dependencies])
-AC_PROG_CC
-AM_C_PROTOTYPES
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-echo 'bin_PROGRAMS = hello' > Makefile.am
-
-cat > hello.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
- printf ("yeah, yeah\n");
- return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'configure.in:2:.*ansi2knr\.1' stderr
-./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
diff --git a/tests/ansi4.test b/tests/ansi4.test
deleted file mode 100755
index 014c308..0000000
--- a/tests/ansi4.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2008, 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 <http://www.gnu.org/licenses/>.
-
-# Quoting regression. Test from Thomas Gagne.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c
-END
-
-: > ansi2knr.1
-: > ansi2knr.c
-: > hello.c
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-$FGREP 'ansi2knr.$(' Makefile.in
diff --git a/tests/ansi5.test b/tests/ansi5.test
deleted file mode 100755
index 55c41f9..0000000
--- a/tests/ansi5.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 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 <http://www.gnu.org/licenses/>.
-
-# Test for ansi2knr in another directory.
-
-required='cc native'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(one/joe.c)
-AM_INIT_AUTOMAKE(liver, 0.23)
-AC_PROG_CC
-AM_C_PROTOTYPES
-AC_OUTPUT(Makefile one/Makefile two/Makefile)
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = one two
-END
-
-mkdir one two
-
-cat > one/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = joe
-END
-
-cat > two/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ../one/ansi2knr
-bin_PROGRAMS = maude
-END
-
-cat > one/joe.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
- printf ("joe\n");
- return 0;
-}
-END
-
-cat > two/maude.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
- printf ("maude\n");
- return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-./configure
-
-# This is ugly! If we set U at make time then the "wrong" file gets
-# included.
-find . -name '*.Po' -print \
-| while read file; do
- base="`echo $file | sed -e 's/\.Po//'`"
- mv $file ${base}_.Po
-done
-
-# So is this! If we set ANSI2KNR on the make command line then the
-# wrong value is passed to two's Makefile.
-mv one/Makefile one/Makefile.old
-sed -e 's,ANSI2KNR =,ANSI2KNR = ./ansi2knr,' < one/Makefile.old > one/Makefile
-
-U=_ $MAKE -e
-./one/joe
-./two/maude
diff --git a/tests/ansi6.test b/tests/ansi6.test
deleted file mode 100755
index 89ca65d..0000000
--- a/tests/ansi6.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2006, 2008, 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 <http://www.gnu.org/licenses/>.
-
-# Check ansi2knr on a source file in subdirectory.
-# From Kevin Ryde.
-
-required='cc native'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(ansi6, 1.0)
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_C_PROTOTYPES
-AC_CONFIG_FILES(Makefile)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c sub/dir.c
-END
-
-cat > hello.c << 'END'
-#include <stdio.h>
-
-extern int foo ();
-
-int
-main (int argc, char **argv)
-{
- printf ("%d\n", foo ());
-}
-END
-
-mkdir sub
-
-cat > sub/dir.c << 'END'
-int
-foo ()
-{
- return 23;
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-
-# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
-test `grep -c ac_cv_prog_cc_stdc configure` -gt 1
-
-./configure ac_cv_prog_cc_stdc=no
-$MAKE
-
-test -f hello_.c
-test -f dir_.c # Must be in current directory.
-test ! -f sub/dir_.c
-$MAKE distclean
-test ! -f hello_.c
-test ! -f dir_.c
-
-# Also run without forcing ansi2knr, so we make sure the
-# rules work with ANSI compilers.
-# Report from Andreas Schwab.
-
-./configure
-$MAKE
diff --git a/tests/ansi7.test b/tests/ansi7.test
deleted file mode 100755
index b06c22e..0000000
--- a/tests/ansi7.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2008, 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 <http://www.gnu.org/licenses/>.
-
-# Check ansi2knr on a source file in subdirectory.
-# ansi6.test is the same test without subdir-objects.
-# From Kevin Ryde.
-
-required='cc native'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(ansi6, 1.0)
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_CONFIG_FILES(Makefile)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr subdir-objects
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c sub/dir.c
-END
-
-cat > hello.c << 'END'
-#include <stdio.h>
-
-extern int foo ();
-
-int
-main (int argc, char **argv)
-{
- printf ("%d\n", foo ());
-}
-END
-
-mkdir sub
-
-cat > sub/dir.c << 'END'
-int
-foo ()
-{
- return 23;
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-
-# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
-test `grep -c ac_cv_prog_cc_stdc configure` -gt 1
-
-./configure ac_cv_prog_cc_stdc=no
-$MAKE
-
-test -f hello_.c
-test -f sub/dir_.c # Must be in sub directory, unlike ansi6.test.
-test ! -f dir_.c
-$MAKE distclean
-test ! -f hello_.c
-test ! -f sub/dir_.c
-
-# Also run without forcing ansi2knr, so we make sure the
-# rules work with ANSI compilers.
-# Report from Andreas Schwab.
-
-./configure
-$MAKE
diff --git a/tests/ansi8.test b/tests/ansi8.test
deleted file mode 100755
index 815a9ae..0000000
--- a/tests/ansi8.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 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 <http://www.gnu.org/licenses/>.
-
-# Check that AM_C_PROTOTYPES is required by ansi2knr
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = hello
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wno-obsolete -a
-grep AM_C_PROTOTYPES stderr
diff --git a/tests/ansi9.test b/tests/ansi9.test
deleted file mode 100755
index 0452405..0000000
--- a/tests/ansi9.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 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 <http://www.gnu.org/licenses/>.
-
-# Check that subdir sources, and file compiled using per-target flags
-# can still be deansified.
-# Report from Paul D. Smith.
-
-required=cc
-. ./defs || Exit 1
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr subdir-objects
-noinst_PROGRAMS = loadavg sub/sub
-loadavg_SOURCES = loadavg.c
-loadavg_CFLAGS = -DTEST
-sub_sub_SOURCES = sub/sub.c
-END
-
-cat > loadavg.c << 'END'
-int
-main ()
-{
- return 0;
-}
-END
-
-mkdir sub
-cp loadavg.c sub/sub.c
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE --add-missing -Wno-override -Wno-obsolete
-
-$FGREP 'loadavg-loadavg$U.o: loadavg$U.c' Makefile.in
-# The following rule should not exist, because the
-# default .o.c: inference rule is enough.
-$FGREP 'sub/sub$U.o: sub/sub$U.c' Makefile.in && Exit 1
-
-if cross_compiling; then
- :
-else
- # Force ansi2knr's use, regardless of the compiler.
- ./configure ac_cv_prog_cc_stdc=no
- $MAKE sub/sub_.c
-fi
-
-:
diff --git a/tests/config-shell-tests.sh b/tests/config-shell-tests.sh
deleted file mode 100755
index 150287e..0000000
--- a/tests/config-shell-tests.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /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 <http://www.gnu.org/licenses/>.
-
-# Driver script to run checks on Automake-provided shell scripts using
-# configure-time $SHELL instead of the system shell /bin/sh.
-
-set -e
-
-fatal_ () { echo "$0: $*" >&2; exit 99; }
-
-# Ensure proper definition of $testsrcdir.
-. ./defs-static || exit 99
-test -n "$testsrcdir" || fatal_ "\$testsrcdir is empty or undefined"
-
-case $#,$1 in
- 0,) fatal_ "missing argument";;
- 1,*-w.shtst) test_name=`expr /"$1" : '.*/\(.*\)-w\.shtst'`;;
- 1,*) fatal_ "invalid argument \`$1'";;
- *) fatal_ "too many arguments";;
-esac
-
-# Run the test using configure-time $SHELL, not /bin/sh, to run the
-# checked shell scripts.
-test_prefer_config_shell=yes
-# This is required to have the wrapped test use a proper temporary
-# directory to run into.
-me=$test_name-w
-# In the spirit of VPATH, we prefer a test in the build tree
-# over one in the source tree.
-if test -f "./$test_name.test"; then
- . "./$test_name.test"
- exit $?
-elif test -f "$testsrcdir/$test_name.test"; then
- . "$testsrcdir/$test_name.test"
- exit $?
-else
- fatal_ "cannot find wrapped test \`$test_name.test'"
-fi
-
-exit 255 # Not reached.
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
deleted file mode 100755
index 49b4a7e..0000000
--- a/tests/cxxansi.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 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 <http://www.gnu.org/licenses/>.
-
-# Test to make sure ansi2knr doesn't use `$U' for C++.
-# Report from Robert Boehne.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-AM_C_PROTOTYPES
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.c jane.C
-END
-
-: > ansi2knr.c
-: > ansi2knr.1
-
-: > doe.C
-: > jane.C
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-$FGREP 'jane$U' Makefile.in && Exit 1
-$FGREP 'doe$U' Makefile.in
-
-Exit 0
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 0f62d32..9f7504e 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -76,6 +76,7 @@ for var in \
using_tap \
parallel_tests \
am_create_testdir \
+ am_tap_implementation \
test_prefer_config_shell \
original_AUTOMAKE \
original_ACLOCAL \
diff --git a/tests/depacl2.test b/tests/depacl2.test
index 86af8c1..a5c3be9 100755
--- a/tests/depacl2.test
+++ b/tests/depacl2.test
@@ -20,14 +20,9 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
-AM_C_PROTOTYPES
-FOO
-END
+echo 'AM_FOO' >> configure.in
+echo 'AC_DEFUN([AM_FOO], [AC_REQUIRE([AC_HEADER_STDC])])' > AM_FOO.m4
-cat > AM_C_PROTOTYPES.m4 << 'END'
-AC_DEFUN([AM_C_PROTOTYPES], [AC_REQUIRE([AC_HEADER_STDC])])
-END
-
-# Our --acdir overrides the one in $ACLOCAL.
$ACLOCAL -I .
+
+:
diff --git a/tests/autodist-acconfig.test
b/tests/doc-parsing-buglets-colneq-subst.test
similarity index 55%
copy from tests/autodist-acconfig.test
copy to tests/doc-parsing-buglets-colneq-subst.test
index 5674e27..685d2b6 100755
--- a/tests/autodist-acconfig.test
+++ b/tests/doc-parsing-buglets-colneq-subst.test
@@ -14,31 +14,26 @@
# 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 `acconfig.h' is automatically distributed if it exists
-# (at automake runtime).
-# Related to automake bug#7819.
+# Check a documented limitation of the Automake's Makefile parser
+# w.r.t. POSIX variable substitutions used in the name of targets.
+# See Section "General Operation" in the Automake manual.
+# If you cause some parts of this test to fail, chances are that you've
+# improved the Automake parser ;-)
+# See: <http://lists.gnu.org/archive/html/automake/2010-08/msg00074.html>
+# or:
<http://thread.gmane.org/gmane.comp.sysutils.automake.general/11943/focus=11962>
. ./defs || Exit 1
-cat >> configure.in <<END
-AC_OUTPUT
-END
+set -e
cat > Makefile.am <<'END'
-.PHONY: test
-test: distdir
- ls -l $(distdir)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
- test -f $(distdir)/acconfig.h
+$(FOO:=x): bar
END
-: > acconfig.h
-
$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
+AUTOMAKE_fails
-./configure
-$MAKE test
+grep 'bad characters.*variable name.*\$(FOO' stderr
+grep ':=.*assignments.*not portable' stderr
:
diff --git a/tests/doc-parsing-buglets-tabs.test
b/tests/doc-parsing-buglets-tabs.test
new file mode 100755
index 0000000..acff363
--- /dev/null
+++ b/tests/doc-parsing-buglets-tabs.test
@@ -0,0 +1,61 @@
+#! /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 <http://www.gnu.org/licenses/>.
+
+# Check the documented limitation of the Automake's Makefile parser w.r.t.
+# use of TAB characters; see Section "General Operation" in the Automake
+# manual, and automake bug#8360.
+# If you cause some parts of this test to fail, chances are that you've
+# improved the Automake parser ;-)
+
+. ./defs || Exit 1
+
+set -e
+
+cat > Makefile.am <<END
+.PHONY: test
+test: all check
+
+fail:
address@hidden "'\$@ recipe executed'"; exit 1
+
+## This won't be recognized as a target+recipe by Automake.
+all-local${tab}:
address@hidden 1
+
+## This won't be recognized as a target+rdependency by Automake.
+all-local${tab}: fail
+
+just_to_separate: dummy deps
+
+## This won't be recognized as a variable assignment by Automake.
+${tab}bin_PROGRAMS = foo
+END
+
+echo AC_OUTPUT >> configure.in
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '$(EXEEEXT)' Makefile.in && Exit 1
+grep 'all:.*all-local' Makefile.in && Exit 1
+grep "^${tab}bin_PROGRAMS = foo" Makefile.in
+
+$AUTOCONF
+./configure
+
+$MAKE test
+
+:
diff --git a/tests/gen-config-shell-tests b/tests/gen-config-shell-tests
deleted file mode 100755
index 82477e3..0000000
--- a/tests/gen-config-shell-tests
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-# Generate config-shell-tests.am.
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-#
-# For each test in the $(handwritten_tests) list in this Makefile.am file,
-# that directly tests features of an automake-provided shell script from
-# the `lib/' subdirectory, define a sibling test that does likewise, but
-# using, to run said script, the configure-time $SHELL instead of the
-# default system shell /bin/sh.
-#
-# A test is considered a candidate for sibling-generation if it calls the
-# `get_shell_script' function anywhere.
-#
-# Individual tests can prevent the creation of such a sibling by explicitly
-# setting the `$test_prefer_config_shell' variable to either "yes" or "no".
-# The rationale for this is that if the variable is set to "yes", the test
-# already uses $SHELL, so that a sibling would be just a duplicate; while
-# if the variable is set to "no", the test doesn't support, or is not meant
-# to use, $SHELL to run the script under testing, and forcing it to do so
-# in the sibling would likely cause a spurious failure.
-#
-
-set -e
-
-tests=`sed -n '/^handwritten_tests =/,/^$/s/\(.*\.test\).*/\1/p' Makefile.am`
-
-if test -z "$tests"; then
- echo "$0: failed to obtain list of tests" >&2
- exit 1
-fi
-
-{
- grep -l '^get_shell_script ' $tests
- grep -l ' get_shell_script ' $tests
-} |
-LC_ALL=C sort -u |
-while read tst; do
- grep "test_prefer_config_shell=" $tst >/dev/null || echo $tst
-done |
-sed -e 's/\.test$//' |
-{
- echo "## Generated by gen-config-shell-tests."
- echo "## Edit Makefile.am instead of this."
- echo "config_shell_tests ="
- # Since `foo-w.shtst' sources `foo.test', `foo-p.log' also depends on
- # `foo.test'.
- sed -e '
- h
- s/^/config_shell_tests += /
- s/$/-w.shtst/
- p
- x
- s/.*/&-w.log: &.test/
- '
-}
diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
deleted file mode 100755
index ed975fe..0000000
--- a/tests/gen-parallel-tests
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Generate parallel-tests.am.
-#
-# Copyright (C) 2009, 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 <http://www.gnu.org/licenses/>.
-
-# For each test in the $(handwritten_tests) list in this Makefile.am file,
-# that itself tests features of the TESTS automake interface, define a
-# sibling test that does likewise, but with the option `parallel-tests'
-# enabled. Individual tests can prevent the creation of such a sibling by
-# explicitly setting the `$parallel_tests' variable to either "yes" or
-# "no". The rationale for this is that if the variable is set to "yes",
-# the test already uses the `parallel-tests' option, so that a sibling
-# would be just a duplicate; while if the variable is set to "no", the
-# test doesn't support, or is not meant to run with, the `parallel-tests'
-# option, and forcing it to do so in the sibling would likely cause a
-# spurious failure.
-
-set -e
-
-tests=`sed -n '/^handwritten_tests =/,/^$/s/\(.*\.test\).*/\1/p' Makefile.am`
-
-if test -z "$tests"; then
- echo "$0: failed to obtain list of tests" >&2
- exit 1
-fi
-
-{
- grep -l '^TESTS ' $tests
- grep -l ' TESTS ' $tests
-} |
-LC_ALL=C sort -u |
-while read tst; do
- if grep '^[^#]*parallel-tests' $tst >/dev/null \
- || grep "parallel_tests=" $tst >/dev/null
- then :; else echo $tst; fi;
-done |
-sed -e 's/\.test$//' |
-{
- echo "## Generated by gen-parallel-tests. Edit Makefile.am instead of this."
- echo "parallel_tests ="
- # Since `foo-p.ptest' sources `foo.test', `foo-p.log' also depends on
- # `foo.test'.
- sed -e '
- h
- s/^/parallel_tests += /
- s/$/-p.ptest/
- p
- x
- s/.*/&-p.log: &.test/
- '
-}
diff --git a/tests/gen-wrap-tests b/tests/gen-wrap-tests
new file mode 100755
index 0000000..f794fb0
--- /dev/null
+++ b/tests/gen-wrap-tests
@@ -0,0 +1,185 @@
+#! /bin/sh
+# Generate wrap-tests.am.
+#
+# Copyright (C) 2009, 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 <http://www.gnu.org/licenses/>.
+
+set -e
+set -u
+
+MAKE=${MAKE-make}
+PERL=${PERL-perl}
+
+tests=`$MAKE -s -f list-of-tests.mk print-list-of-tests` \
+ && tests=`echo $tests` && test -n "$tests" \
+ || { echo "$0: cannot get list of tests" >&2; exit 1; }
+
+st=0
+for tst in $tests; do
+ test -f $tst || { echo "$0: test \`$tst' not found" >&2; st=1; }
+done
+test $st -eq 0 || exit 1
+
+add_wrapper_type () { wrapper_type_list="$wrapper_type_list $*"; }
+wrapper_type_list="" # Avoid interferences from the environment.
+
+#
+# For each test script in the Automake testsuite that itself tests features
+# of the TESTS automake interface, define a sibling test that does likewise,
+# but with the option `parallel-tests' enabled.
+#
+# A test is considered a candidate for sibling-generation if any
+# Makefile.am generated by it define the TESTS variable.
+#
+# Individual tests can prevent the creation of such a sibling by explicitly
+# setting the `$parallel_tests' variable to either "yes" or "no". The
+# rationale for this is that if the variable is set to "yes", the test
+# already uses the `parallel-tests' option, so that a sibling would be just
+# a duplicate; while if the variable is set to "no", the test doesn't
+# support, or is not meant to run with, the `parallel-tests' option, and
+# forcing it to do so in the sibling would likely cause a spurious failure.
+#
+get_list_for_pt ()
+{
+ { grep -l '^TESTS *=' $*; grep -l ' TESTS *=' $*; } \
+ | LC_ALL=C sort -u \
+ | while read tst; do
+ grep '^[^#]*parallel-tests' $tst >/dev/null && continue
+ grep "parallel_tests=" $tst >/dev/null && continue
+ echo $tst
+ done
+}
+defines_for_pt='--define parallel_tests "yes"'
+add_wrapper_type "pt"
+
+#
+# For each test script in the Automake testsuite that tests features of
+# one or more automake-provided shell script from the `lib/' subdirectory
+# by running those scripts directly (i.e., not thought make calls and
+# automake-generated makefiles), define a sibling test that does likewise,
+# but running the said script with the configure-time $SHELL instead of
+# the default system shell /bin/sh.
+#
+# A test is considered a candidate for sibling-generation if it calls the
+# `get_shell_script' function anywhere.
+#
+# Individual tests can prevent the creation of such a sibling by explicitly
+# setting the `$test_prefer_config_shell' variable to either "yes" or "no".
+# The rationale for this is that if the variable is set to "yes", the test
+# already uses $SHELL, so that a sibling would be just a duplicate; while
+# if the variable is set to "no", the test doesn't support, or is not meant
+# to use, $SHELL to run the script under testing, and forcing it to do so
+# in the sibling would likely cause a spurious failure.
+#
+get_list_for_cs ()
+{
+ { grep -l '^get_shell_script ' $*; grep -l ' get_shell_script ' $*; } \
+ | LC_ALL=C sort -u \
+ | while read tst; do
+ grep "test_prefer_config_shell=" $tst >/dev/null || echo $tst
+ done
+}
+defines_for_cs='--define test_prefer_config_shell "yes"'
+add_wrapper_type "cs"
+
+# Tests on tap support should be run with both the perl and awk
+# implementations of the TAP driver.
+get_list_for_pltap ()
+{
+ {
+ grep -l '[ /]tap-setup\.sh' $*;
+ grep -l '^fetch_tap_driver$' $*;
+ grep -l '^fetch_tap_driver ' $*;
+ grep -l ' fetch_tap_driver$' $*;
+ grep -l ' fetch_tap_driver ' $*;
+ } | LC_ALL=C sort -u \
+ | while read tst; do
+ grep "am_tap_implementation=" $tst >/dev/null || echo $tst
+ done
+}
+defines_for_pltap='--define am_tap_implementation "perl"'
+add_wrapper_type "pltap"
+
+echo '## Generated by gen-wrapped-tests. DO NOT EDIT.'
+echo 'wrap_TESTS ='
+echo 'wrap_LOGS ='
+echo
+
+# NOTE: the following is not really right, since cannot compose wrapping
+# of tests matching more than one condition. Still, there should be no
+# such test at the moment, so the limitation is acceptable. Also, if
+# this invariant stops holding, the check `check-no-repeated-test-name'
+# in Makefile.am will start failing.
+
+for wtype in $wrapper_type_list; do
+ eval defines=\${defines_for_$wtype}
+ get_list_for_$wtype $tests \
+ | wtype="$wtype" defines="$defines" $PERL -w -e '
+ use strict;
+ use warnings FATAL => "all";
+
+ my $wtype = $ENV{"wtype"};
+
+ # Suffix for a generated wrapped test, from the suffix of a
+ # hand-written test.
+ sub gen_suffix ($) { return $_[0] . "_" . $wtype; }
+
+ HANDLE_SUFFIX :
+ {
+ my %have_suffix;
+ sub handle_if_new_suffix ($)
+ {
+ my $suf = shift;
+ return
+ if $have_suffix{$suf};
+ $have_suffix{$suf} = 1;
+ print "\n";
+ print "TEST_EXTENSIONS += ." . gen_suffix ($suf) . "\n";
+ my $uc_orig_suf = uc ($suf);
+ my $uc_wrap_suf = uc ($suf) . "_" . uc ($wtype);
+ print <<EOF;
+
+${uc_wrap_suf}_LOG_DRIVER = \\
+ \$(${uc_orig_suf}_LOG_DRIVER)
+
+AM_${uc_wrap_suf}_LOG_DRIVER_FLAGS = \\
+ \$(AM_${uc_orig_suf}_LOG_DRIVER_FLAGS) \\
+ \$(${uc_orig_suf}_LOG_DRIVER_FLAGS)
+
+${uc_wrap_suf}_LOG_COMPILER = \\
+ \$(LOG_COMPILER) \$(srcdir)/wrap-tests.sh \\
+ --type $wtype $ENV{"defines"}
+
+EOF
+ }
+ }
+ while (<>)
+ {
+ chomp;
+ if (/^(.*)\.(test|tap)$/)
+ {
+ my ($bas, $suf) = ($1, $2);
+ handle_if_new_suffix ($suf);
+ print "wrap_TESTS += $bas-w." . gen_suffix ($suf) . "\n";
+ print "wrap_LOGS += $bas-w.log\n";
+ print "$bas-w.log: $bas.$suf\n";
+ }
+ else
+ {
+ die "invalid test name `$_`";
+ }
+ }
+ '
+done
diff --git a/tests/libobj8.test b/tests/libobj8.test
deleted file mode 100755
index 0745f61..0000000
--- a/tests/libobj8.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2006, 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 <http://www.gnu.org/licenses/>.
-
-# Test to make sure `_.c' dependencies are generated for LIBOBJS
-# objects.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CC_STDC
-AC_PROG_RANLIB
-AC_REPLACE_FUNCS(basename dirname strsignal)
-AM_C_PROTOTYPES
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > basename.c
-: > dirname.c
-: > strsignal.c
-
-: > ansi2knr.1
-: > ansi2knr.c
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-$FGREP 'strsignal_.c:' Makefile.in
-
-:
diff --git a/tests/Makefile.am b/tests/list-of-tests.mk
similarity index 73%
copy from tests/Makefile.am
copy to tests/list-of-tests.mk
index ce37884..073c06c 100644
--- a/tests/Makefile.am
+++ b/tests/list-of-tests.mk
@@ -1,119 +1,27 @@
-## Process this file with automake to create Makefile.in
+## 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) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+## 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 <http://www.gnu.org/licenses/>.
-# 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/>.
-
-# Run the tests with the shell detected at configure time.
-LOG_COMPILER = $(SHELL)
-
-TEST_EXTENSIONS = .test .tap
-TEST_LOG_COMPILER = $(LOG_COMPILER)
-TAP_LOG_COMPILER = $(LOG_COMPILER)
-
-TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-
-AM_TAP_LOG_DRIVER_FLAGS = --merge --comments
-## Avoid spurious TAP diagnostic. We use an awful indirection with a
-## shell command substitution here, since the string needs to contain
-## `#' characters, and these can't be escaped portably in a make macro
-## definition.
-## FIXME: this is quite inefficient though, as it adds one extra fork
-## FIXME: per TAP test script; this is OK for the moment, since we have
-## FIXME: few such scripts, but might become an issue in the future.
-## Keep this in sync with the definition of $diag_string_ in tests/defs.
-AM_TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf '\043%%\043\n'`
-
-MAINTAINERCLEANFILES =
-EXTRA_DIST = ChangeLog-old
-
-XFAIL_TESTS = \
-all.test \
-cond17.test \
-gcj6.test \
-override-conditional-2.test \
-pr8365-remake-timing.test \
-yacc-dist-nobuild-subdir.test \
-txinfo5.test
-
-
-include $(srcdir)/parallel-tests.am
-
-$(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
- $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
-EXTRA_DIST += gen-parallel-tests
-
-TEST_EXTENSIONS += .ptest
-PTEST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/parallel-tests.sh
-EXTRA_DIST += parallel-tests.sh
-
-# All `*-p.ptest' tests work by sourcing the script `parallel-tests.sh'.
-$(parallel_tests:.ptest=.log): parallel-tests.sh
-# This dummy declaration is required to have make actually produce
-# expected log files from the `.ptest.log' suffix rule.
-$(parallel_tests):
-
-
-include $(srcdir)/config-shell-tests.am
-
-$(srcdir)/config-shell-tests.am: gen-config-shell-tests Makefile.am
- $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-config-shell-tests)
>$@
-EXTRA_DIST += gen-config-shell-tests
-
-TEST_EXTENSIONS += .shtst
-SHTST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/config-shell-tests.sh
-EXTRA_DIST += config-shell-tests.sh
-
-# All `*-w.shtst' tests work by sourcing the script `config-shell-tests.sh'.
-$(config_shell_tests:.shtst=.log): config-shell-tests.sh
-# This dummy declaration is required to have make actually produce
-# expected log files from the `.shtst.log' suffix rule.
-$(config_shell_tests):
-
-
-# Some testsuite-influential variables should be overridable from the
-# test scripts, but not from the environment.
-AM_TESTS_ENVIRONMENT = \
- test x"$$me" = x || unset me; \
- test x"$$required" = x || unset required; \
- test x"$$using_tap" = x || unset using_tap; \
- test x"$$parallel_tests" = x || unset parallel_tests; \
- test x"$$test_prefer_config_shell" || unset test_prefer_config_shell; \
- test x"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \
- test x"$$original_ACLOCAL" = x || unset original_ACLOCAL;
-# The `AM_TESTS_REEXEC=no' setting tells the tests not to needlessly
-# re-execute themselves with the shell detected at configure time, since
-# we are already running them under it explicitly in our setup (see e.g.
-# the definition of TEST_LOG_COMPILER above).
-AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC;
-# We want warning messages and explanations for skipped tests to go to
-# the console if possible, so set up `stderr_fileno_' properly.
-AM_TESTS_FD_REDIRECT = 9>&2
-AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
-
-TESTS = \
- $(handwritten_tests) \
- $(config_shell_tests) \
- $(parallel_tests)
-
-EXTRA_DIST += $(handwritten_tests)
-
-handwritten_tests = \
-## This tests might quite a long time, since they run various checks
-## sequentially; so place them early first to improve performance on
-## concurrent testsuite runs.
+# 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 \
@@ -158,18 +66,7 @@ amopt.test \
amopts-location.test \
amopts-variable-expansion.test \
amsubst.test \
-ansi2knr-deprecation.test \
-ansi.test \
-ansi2.test \
-ansi3.test \
-ansi3b.test \
-ansi4.test \
-ansi5.test \
-ansi6.test \
-ansi7.test \
-ansi8.test \
-ansi9.test \
-ansi10.test \
+ansi2knr-no-more.test \
ar-lib.test \
ar.test \
ar2.test \
@@ -359,7 +256,6 @@ cscope2.test \
cscope3.test \
cxx.test \
cxx2.test \
-cxxansi.test \
cxxcpp.test \
cxxlibobj.test \
cxxlink.test \
@@ -422,6 +318,8 @@ distcheck-configure-flags-subpkg.test \
distcheck-hook.test \
distcheck-hook2.test \
dmalloc.test \
+doc-parsing-buglets-colneq-subst.test \
+doc-parsing-buglets-tabs.test \
dollar.test \
dollarvar.test \
dollarvar2.test \
@@ -572,7 +470,6 @@ libobj3.test \
libobj4.test \
libobj5.test \
libobj7.test \
-libobj8.test \
libobj10.test \
libobj12.test \
libobj13.test \
@@ -672,6 +569,7 @@ mkinst3.test \
mmode.test \
mmodely.test \
multlib.test \
+no-extra-makefile-code.test \
no-outdir-option.test \
nobase.test \
nobase-libtool.test \
@@ -978,7 +876,6 @@ subcond2.test \
subcond3.test \
subobj.test \
subobj2.test \
-subobj3.test \
subobj4.test \
subobj5.test \
subobj6.test \
@@ -1021,8 +918,8 @@ suffix-chain.tap \
symlink.test \
symlink2.test \
syntax.test \
-$(tap_with_common_setup_tests) \
-$(tap_other_tests) \
+$(tap_with_common_setup_TESTS) \
+$(tap_other_TESTS) \
tags.test \
tags2.test \
tagsub.test \
@@ -1076,6 +973,7 @@ vala2.test \
vala3.test \
vala4.test \
vala5.test \
+vala-vpath.test \
vars.test \
vars3.test \
vartar.test \
@@ -1133,27 +1031,10 @@ yflags-force-override.test \
yflags-force-conditional.test \
yflags-var-expand.test
-## Files containing auxiliary functions used by our test cases.
-EXTRA_DIST += tap-functions.sh plain-functions.sh
-
-test-driver-custom-multitest.log: trivial-test-driver
-test-driver-custom-multitest-recheck.log: trivial-test-driver
-test-driver-custom-multitest-recheck2.log: trivial-test-driver
-test-driver-custom-html.log: trivial-test-driver
-EXTRA_DIST += trivial-test-driver
-
-testsuite-summary-color.log testsuite-summary-count.log: \
- testsuite-summary-checks.sh extract-testsuite-summary
-EXTRA_DIST += testsuite-summary-checks.sh
-EXTRA_DIST += extract-testsuite-summary
-
-testsuite-summary-count-many.log: trivial-test-driver
-testsuite-summary-count-many.log: extract-testsuite-summary
-
# List of tests on TAP support that use the files pre-computed by
-# `tap-common-setup.test', and sources the `tap-setup.sh' helper
+# `tap-common-setup.test', and source the `tap-setup.sh' helper
# script.
-tap_with_common_setup_tests = \
+tap_with_common_setup_TESTS = \
tap-ambiguous-directive.test \
tap-autonumber.test \
tap-bailout.test \
@@ -1225,15 +1106,8 @@ tap-whitespace-normalization.test \
tap-with-and-without-number.test \
tap-xfail-tests.test
-# Their log files.
-tap_with_common_setup_logs = $(tap_with_common_setup_tests:.test=.log)
-
-# Their dependencies.
-$(tap_with_common_setup_logs): tap-common-setup.log tap-setup.sh
-EXTRA_DIST += tap-setup.sh
-
# Other tests on TAP support.
-tap_other_tests = \
+tap_other_TESTS = \
tap-common-setup.test \
tap-bad-prog.tap \
tap-basic.test \
@@ -1247,42 +1121,6 @@ tap-recheck.test \
tap-summary.test \
tap-summary-color.test
-tap-summary.log tap-summary-color.log: tap-summary-aux.sh
-EXTRA_DIST += tap-summary-aux.sh
-
-# If two test scripts have the same basename, they will end up sharing
-# the same log file, leading to all sort of undefined and undesired
-# behaviours.
-check-no-repeated-test-name:
- @LC_ALL=C; export LC_ALL; \
- lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \
- | sort | uniq -c | awk '($$1 > 1) { print }' \
- | sed 's/\.log$$//' | grep . >&2 \
- && { \
- echo $@: test names listed above are duplicated >&2; \
- exit 1; \
- }; :
-check-local: check-no-repeated-test-name
-.PHONY: check-no-repeated-test-name
-
-## Checking the list of tests.
-checked_test_extensions = .test .tap
-expected_list_of_tests = $(handwritten_tests)
-include $(top_srcdir)/CheckListOfTests.am
-
-# Dependencies valid for each test case.
-$(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION)
-# FIXME: this should be made more granular once we have a cleaner
-# subdivision of the tests.
-$(TEST_LOGS): plain-functions.sh tap-functions.sh
-
-clean-local: clean-local-check
-.PHONY: clean-local-check
-clean-local-check:
- -set x *.dir; shift; \
- if test "$$#,$$1" = "1,*.dir"; then \
- : there is no test directory to clean; \
- else \
- find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
- rm -rf "$$@"; \
- fi;
+print-list-of-tests:
+ @echo $(handwritten_TESTS)
+.PHONY: print-list-of-tests
diff --git a/tests/output3.test b/tests/no-extra-makefile-code.test
similarity index 62%
copy from tests/output3.test
copy to tests/no-extra-makefile-code.test
index 2626113..73d5458 100755
--- a/tests/output3.test
+++ b/tests/no-extra-makefile-code.test
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 Free Software
# Foundation, Inc.
#
@@ -15,25 +15,23 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Yet another AC_OUTPUT test.
+# Check that we don't emit harmless but useless code in the generated
+# Makefile.in when the project does not use compiled languages. Motivated
+# by a regression caused by removal of automatic de-ANSI-fication support:
+# <http://lists.gnu.org/archive/html/automake-patches/2011-08/msg00200.html>
. ./defs || Exit 1
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_OUTPUT([Makefile
-tests/Makefile tests/defs],
-[blah])
-END
+echo AC_OUTPUT >> configure.in
: > Makefile.am
-mkdir tests
-: > tests/Makefile.am
-: > tests/defs.in
+rm -f depcomp compile
$ACLOCAL
$AUTOMAKE
+$EGREP 'DEFAULT_INCLUDES|@am__isrc@|-compile|\$\(OBJEXT\)|tab\.[ch]' \
+ Makefile.in && Exit 1
+
:
diff --git a/tests/parallel-tests.sh b/tests/parallel-tests.sh
deleted file mode 100755
index b6bbff3..0000000
--- a/tests/parallel-tests.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /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 <http://www.gnu.org/licenses/>.
-
-# Driver script to run checks the on the `parallel-tests' semantics
-# by wrapping tests that use the generic "Simple Tests" driver.
-
-set -e
-
-fatal_ () { echo "$0: $*" >&2; exit 99; }
-
-# Ensure proper definition of $testsrcdir.
-. ./defs-static || exit 99
-test -n "$testsrcdir" || fatal_ "\$testsrcdir is empty or undefined"
-
-case $#,$1 in
- 0,) fatal_ "missing argument";;
- 1,*-p.ptest) test_name=`expr /"$1" : '.*/\(.*\)-p\.ptest'`;;
- 1,*) fatal_ "invalid argument \`$1'";;
- *) fatal_ "too many arguments";;
-esac
-
-# Run the test with Automake's parallel-tests driver enabled.
-parallel_tests=yes
-# This is required to have the wrapped test use a proper temporary
-# directory to run into.
-me=$test_name-p
-# In the spirit of VPATH, we prefer a test in the build tree
-# over one in the source tree.
-if test -f "./$test_name.test"; then
- . "./$test_name.test"
- exit $?
-elif test -f "$testsrcdir/$test_name.test"; then
- . "$testsrcdir/$test_name.test"
- exit $?
-else
- fatal_ "cannot find wrapped test \`$test_name.test'"
-fi
-
-exit 255 # Not reached.
diff --git a/tests/self-check-env-sanitize.tap
b/tests/self-check-env-sanitize.tap
index 09a657c..ad6fb31 100755
--- a/tests/self-check-env-sanitize.tap
+++ b/tests/self-check-env-sanitize.tap
@@ -24,7 +24,7 @@ am_create_testdir=no
set -x
exec 5>&1
-plan_ 16 # Two times the number of variable names in $vars.
+plan_ 18 # Two times the number of variable names in $vars.
vars='
me
@@ -32,6 +32,7 @@ vars='
required
using_tap
am_create_testdir
+ am_tap_implementation
test_prefer_config_shell
original_AUTOMAKE
original_ACLOCAL
diff --git a/tests/subobj3.test b/tests/subobj3.test
deleted file mode 100755
index bb08beb..0000000
--- a/tests/subobj3.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 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 <http://www.gnu.org/licenses/>.
-
-# Test of subdir objects with ansi2knr.
-
-required='cc native'
-. ./defs || Exit 1
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = hello
-hello_SOURCES = sub/hello.c
-END
-
-mkdir sub
-cat > sub/hello.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
- printf ("yeah, yeah\n");
- return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
-
-:
diff --git a/tests/distcheck-hook.test b/tests/vala-vpath.test
similarity index 61%
copy from tests/distcheck-hook.test
copy to tests/vala-vpath.test
index 16b151e..98e0f43 100755
--- a/tests/distcheck-hook.test
+++ b/tests/vala-vpath.test
@@ -14,38 +14,45 @@
# 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 basic support for distcheck-hook.
+# Test to make sure vala support handles from-scratch VPATH builds.
+# See automake bug#8753.
+required="valac"
. ./defs || Exit 1
+set -e
+
+mkdir src
+
cat >> configure.in << 'END'
+AC_CONFIG_SRCDIR([hello.vala])
+AC_PROG_CC
+AM_PROG_VALAC([0.7])
AC_OUTPUT
END
+
cat > Makefile.am <<'END'
-distcheck-hook:
- ls -l $(distdir)
- chmod u+w $(distdir)
- : > $(distdir)/dc-hook-has-run
- chmod a-w $(distdir)
-check-local:
- ls -l $(srcdir)
- test -f $(srcdir)/dc-hook-has-run
+bin_PROGRAMS = foo
+foo_SOURCES = hello.vala
END
-$ACLOCAL
-$AUTOMAKE
-$FGREP 'distcheck-hook' Makefile.in
-$FGREP '$(MAKE) $(AM_MAKEFLAGS) distcheck-hook' Makefile.in
-grep '^distcheck-hook:' Makefile.in
+cat > hello.vala <<'END'
+void main ()
+{
+ stdout.printf ("foo\n");
+ return 0;
+}
+END
-$AUTOCONF
-./configure
+$ACLOCAL || framework_failure_ "aclocal error"
+$AUTOCONF || framework_failure_ "autoconf error"
+$AUTOMAKE || framework_failure_ "automake error"
+mkdir build
+cd build
+../configure || Exit 77
$MAKE
-$MAKE check && Exit 1
-$MAKE distdir
-test -f $distdir/dc-hook-has-run && Exit 1
$MAKE distcheck
:
diff --git a/tests/wrap-tests.sh b/tests/wrap-tests.sh
new file mode 100755
index 0000000..2eb65a5
--- /dev/null
+++ b/tests/wrap-tests.sh
@@ -0,0 +1,89 @@
+#! /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 <http://www.gnu.org/licenses/>.
+
+# Wrap en existing test script of the automake testsuite by pre-defining
+# some influential variables and then sourcing it.
+
+set -e
+
+# Will be properly overridden once the wrapped test script is sourced.
+fatal_ () { echo "$0: $*" >&2; exit 99; }
+
+# Ensure proper definition of $testsrcdir.
+. ./defs-static || fatal_ "couldn't source ./defs-static"
+test x"$testsrcdir" != x || fatal_ "\$testsrcdir is empty or undefined"
+
+echo "args: $*" # For debugging.
+
+typ=
+while test $# -gt 0; do
+ case $1 in
+ --define)
+ test $# -ge 3 || fatal_ "option \`$1': two arguments required"
+ echo "define: $2='$3'" # For debugging.
+ eval "$2=\$3"
+ shift; shift;;
+ --type)
+ test $# -ge 2 || fatal_ "option \`$1': argument required"
+ typ=$2
+ shift;;
+ --)
+ shift; break;;
+ *)
+ break;;
+ -*)
+ fatal_ "invalid option: \`$1'";;
+ esac
+ shift
+done
+
+case $typ in
+ "") fatal_ "suffix not specified";;
+ *.*) fatal_ "invalid suffix \`$typ' (contains dot)";;
+esac
+
+case $# in
+ 0) fatal_ "missing argument";;
+ 1) ;;
+ *) fatal_ "too many arguments";;
+esac
+
+# We must let the code in ./defs which kind of test script it is
+# dealing with -- TAP or "plain". It won't be able to guess
+# automatically, since it uses `$0' for such a guess, and with
+# the present usage `$0' is always `wrap-tests.sh'.
+case $1 in
+ *-w.test_$typ) using_tap=no suf=test;;
+ *-w.tap_$typ) using_tap=yes suf=tap;;
+ *) fatal_ "invalid argument \`$1'";;
+esac
+
+test_name=`expr x/"$1" : ".*/\\\\(.*\\\\)-w\\\\.[^.][^.]*$"` \
+ && test -n "$test_name" \
+ || fatal_ "couldn't extract test name"
+shift
+
+# This is required to have the wrapped test use a proper temporary
+# directory to run into.
+me=${test_name}-w
+# In the spirit of VPATH, we prefer a test in the build tree
+# over one in the source tree.
+for dir in . "$testsrcdir"; do
+ . "$dir/$test_name.$suf"
+ exit $?
+done
+
+fatal_ "cannot find wrapped test \`$test_name'"
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1276-g94be283,
Stefano Lattarini <=