[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-1636-gc3bcf99 |
|
Date: |
Fri, 23 Dec 2011 21:29:11 +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=c3bcf99ccfdb499e0e97128910a5d920ab5338f0
The branch, testsuite-work has been updated
via c3bcf99ccfdb499e0e97128910a5d920ab5338f0 (commit)
via ca63bc9fe2331a1d83dc35a3af1efeb64fb204d5 (commit)
via 2a0534dad9161af0e9dc7fdf5cfc6dba8414c293 (commit)
via e3186cb4953d35da93e4648355f60b2efb5ff0d6 (commit)
via 0886b05af81d5aaa54be74bd72ab503e8bfd4db1 (commit)
from 8f5274a94fd12afa4fea7b2df4be0f5ca4dce705 (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 c3bcf99ccfdb499e0e97128910a5d920ab5338f0
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 23 22:14:50 2011 +0100
tests: automatically handle deps also for generated tests
* tests/gen-testsuite-part: The test scripts are now scanned for
automatic dependency generation *after* the auto-generated tests
have been created, so they too will be scanned. It is a little
tricky to ensure that the freshly-generated tests are correctly
scanned, and we do that with the help of ...
(@generated_tests): ... this new variable.
Other related minor changes and refactorings.
commit ca63bc9fe2331a1d83dc35a3af1efeb64fb204d5
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 23 21:21:08 2011 +0100
tests: auto-generate deps for tests requiring libtool/gettext
* tests/gen-testsuite-part: Tests requiring libtool (or related
programs) will need libtool-provided m4 macros, so they should
be run after `libtool-macros.test'. Similarly for gettext tests.
So, generate proper declarations of such dependencies.
* tests/Makefile.am: Remove now-unneeded hand-written declaration
of those dependencies.
commit 2a0534dad9161af0e9dc7fdf5cfc6dba8414c293
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 23 21:01:59 2011 +0100
tests: remove FIXME comments from tricks to pacify syntax checks
Originally, I myself had insisted on adding those "FIXME" comments
near every unusual construct or use of "creative quoting" whose
only purpose was to avoid false positive from out syntax checks.
I did that with the expectation that we could have easily and soon
added a whitelisting capability to our maintainer-specific syntax
checks. This hasn't been the case unfortunately, and now those
"FIXME" in the comments are just distracting noise, making it more
difficult to grep the test cases for stuff that could really use a
fix or an improvement. So just get rid of them.
* tests/instdir-ltlib.test: Remove that extra "FIXME".
* tests/instdir-prog.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/parallel-tests-dry-run.test: Likewise.
* tests/parallel-tests-console-output.test: Likewise.
* tests/parallel-tests-no-color-in-log.test: Likewise.
* tests/tap-realtime.test: Likewise.
* tests/test-trs-recover.test: Likewise.
* tests/tap-deps.test: Likewise.
commit e3186cb4953d35da93e4648355f60b2efb5ff0d6
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 23 20:39:46 2011 +0100
tests: few minor fixlets, improvements and tweakings
* tests/defs-static.in ($top_testbuilddir): New, for consistency
and completeness.
* tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
as well.
* tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
over TESTS_ENVIRONMENT, now that the former has become available.
* tests/java-compile-run-flat.test: Correct a botched "FIXME"
comment.
* tests/tap-realtime.test: Remove extra whitespace in comments.
* tests/missing-tar.test: Use `get_shell_script' to bring in the
`missing' script, to increase coverage. Remove redundant call to
`set -e'. Fix a typo in comments.
* tests/get-sysconf.test: Remove redundant definitions of
`$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.
commit 0886b05af81d5aaa54be74bd72ab503e8bfd4db1
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 23 18:02:21 2011 +0100
tests: remove redundant uses of `set -e'
* tests/deleted-am.test: Do not set the `errexit' shell flag, as
it is already set by `tests/defs'.
* tests/deleted-m4.test: Likewise.
* tests/dist-missing-am.test: Likewise.
* tests/dist-missing-am.test: Likewise.
* tests/dist-missing-m4.test: Likewise.
* tests/dist-missing-included-m4.test: Likewise.
* tests/get-sysconf.test: Likewise.
* tests/makefile-deps.test: Likewise.
* tests/remake-m4-pr10111.test: Likewise.
* tests/remake-am-pr10111.test: Likewise.
* tests/remake-deleted-am.test: Likewise.
* tests/remake-deleted-am2.test: Likewise.
* tests/remake-deleted-am-subdir.test: Likewise.
* tests/remake-renamed-am.test: Likewise.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 80 +++++++++++++++++++++++++++++
tests/Makefile.am | 69 +------------------------
tests/defs-static.in | 1 +
tests/deleted-am.test | 2 -
tests/deleted-m4.test | 2 -
tests/dist-missing-am.test | 2 -
tests/dist-missing-included-m4.test | 2 -
tests/dist-missing-m4.test | 2 -
tests/gen-testsuite-part | 72 +++++++++++++++++---------
tests/get-sysconf.test | 7 ---
tests/instdir-ltlib.test | 4 +-
tests/instdir-prog.test | 4 +-
tests/java-compile-run-flat.test | 4 +-
tests/java-compile-run-nested.test | 3 +-
tests/makefile-deps.test | 2 -
tests/missing-tar.test | 10 +---
tests/parallel-tests-console-output.test | 2 +-
tests/parallel-tests-dry-run.test | 4 +-
tests/parallel-tests-no-color-in-log.test | 4 +-
tests/parallel-tests3.test | 2 +-
tests/remake-am-pr10111.test | 2 -
tests/remake-deleted-am-2.test | 2 -
tests/remake-deleted-am-subdir.test | 2 -
tests/remake-deleted-am.test | 2 -
tests/remake-m4-pr10111.test | 2 -
tests/remake-renamed-am.test | 2 -
tests/tap-deps.test | 6 ++-
tests/tap-realtime.test | 4 +-
tests/test-trs-recover.test | 2 +-
29 files changed, 152 insertions(+), 150 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b75627a..2c5cf2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2011-12-23 Stefano Lattarini <address@hidden>
+
+ tests: automatically handle deps also for generated tests
+ * tests/gen-testsuite-part: The test scripts are now scanned for
+ automatic dependency generation *after* the auto-generated tests
+ have been created, so they too will be scanned. It is a little
+ tricky to ensure that the freshly-generated tests are correctly
+ scanned, and we do that with the help of ...
+ (@generated_tests): ... this new variable.
+ Other related minor changes and refactorings.
+
+2011-12-23 Stefano Lattarini <address@hidden>
+
+ tests: auto-generate deps for tests requiring libtool/gettext
+ * tests/gen-testsuite-part: Tests requiring libtool (or related
+ programs) will need libtool-provided m4 macros, so they should
+ be run after `libtool-macros.test'. Similarly for gettext tests.
+ So, generate proper declarations of such dependencies.
+ * tests/Makefile.am: Remove now-unneeded hand-written declaration
+ of those dependencies.
+
+2011-12-23 Stefano Lattarini <address@hidden>
+
+ tests: remove FIXME comments from tricks to pacify syntax checks
+ Originally, I myself had insisted on adding those "FIXME" comments
+ near every unusual construct or use of "creative quoting" whose
+ only purpose was to avoid false positive from out syntax checks.
+ I did that with the expectation that we could have easily and soon
+ added a whitelisting capability to our maintainer-specific syntax
+ checks. This hasn't been the case unfortunately, and now those
+ "FIXME" in the comments are just distracting noise, making it more
+ difficult to grep the test cases for stuff that could really use a
+ fix or an improvement. So just get rid of them.
+ * tests/instdir-ltlib.test: Remove that extra "FIXME".
+ * tests/instdir-prog.test: Likewise.
+ * tests/parallel-tests3.test: Likewise.
+ * tests/parallel-tests-dry-run.test: Likewise.
+ * tests/parallel-tests-console-output.test: Likewise.
+ * tests/parallel-tests-no-color-in-log.test: Likewise.
+ * tests/tap-realtime.test: Likewise.
+ * tests/test-trs-recover.test: Likewise.
+ * tests/tap-deps.test: Likewise.
+
+2011-12-23 Stefano Lattarini <address@hidden>
+
+ tests: few minor fixlets, improvements and tweakings
+ * tests/defs-static.in ($top_testbuilddir): New, for consistency
+ and completeness.
+ * tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
+ as well.
+ * tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
+ over TESTS_ENVIRONMENT, now that the former has become available.
+ * tests/java-compile-run-flat.test: Correct a botched "FIXME"
+ comment.
+ * tests/tap-realtime.test: Remove extra whitespace in comments.
+ * tests/missing-tar.test: Use `get_shell_script' to bring in the
+ `missing' script, to increase coverage. Remove redundant call to
+ `set -e'. Fix a typo in comments.
+ * tests/get-sysconf.test: Remove redundant definitions of
+ `$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.
+
+2011-12-23 Stefano Lattarini <address@hidden>
+
+ tests: remove redundant uses of `set -e'
+ * tests/deleted-am.test: Do not set the `errexit' shell flag, as
+ it is already set by `tests/defs'.
+ * tests/deleted-m4.test: Likewise.
+ * tests/dist-missing-am.test: Likewise.
+ * tests/dist-missing-am.test: Likewise.
+ * tests/dist-missing-m4.test: Likewise.
+ * tests/dist-missing-included-m4.test: Likewise.
+ * tests/get-sysconf.test: Likewise.
+ * tests/makefile-deps.test: Likewise.
+ * tests/remake-m4-pr10111.test: Likewise.
+ * tests/remake-am-pr10111.test: Likewise.
+ * tests/remake-deleted-am.test: Likewise.
+ * tests/remake-deleted-am2.test: Likewise.
+ * tests/remake-deleted-am-subdir.test: Likewise.
+ * tests/remake-renamed-am.test: Likewise.
+
2011-12-22 Stefano Lattarini <address@hidden>
tests: fix failure due to debugging code forgotten into a test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25de9a4..78312a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -119,6 +119,7 @@ do_subst = sed \
-e 's|@address@hidden|$(abs_srcdir)|g' \
-e 's|@address@hidden|$(abs_top_srcdir)|g' \
-e 's|@address@hidden|$(abs_builddir)|g' \
+ -e 's|@address@hidden|$(abs_top_builddir)|g' \
-e 's|@address@hidden|$(prefix)|g' \
-e 's|@address@hidden|$(amdir)|g' \
-e 's|@address@hidden|$(bindir)|g' \
@@ -180,74 +181,6 @@ include $(top_srcdir)/CheckListOfTests.am
installcheck-local:
am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
-# FIXME: make these automatically computed once we are merged into
-# FIXME: the `testsuite-work' branch.
-ar-lib4.log: libtool-macros.log
-ar-lib6a.log: libtool-macros.log
-ar-lib6b.log: libtool-macros.log
-canon6.log: libtool-macros.log
-canon7.log: libtool-macros.log
-depcomp4.log: libtool-macros.log
-depcomp7.log: libtool-macros.log
-depcomp8b.log: libtool-macros.log
-extradep2.log: libtool-macros.log
-fort5.log: libtool-macros.log
-instdir-ltlib.log: libtool-macros.log
-instfail-libtool.log: libtool-macros.log
-ldadd.log: libtool-macros.log
-ldflags.log: libtool-macros.log
-libobj13.log: libtool-macros.log
-libtoo10.log: libtool-macros.log
-libtoo11.log: libtool-macros.log
-libtool.log: libtool-macros.log
-libtool2.log: libtool-macros.log
-libtool3.log: libtool-macros.log
-libtool5.log: libtool-macros.log
-libtool6.log: libtool-macros.log
-libtool7.log: libtool-macros.log
-libtool8.log: libtool-macros.log
-libtool9.log: libtool-macros.log
-listval.log: libtool-macros.log
-ltcond.log: libtool-macros.log
-ltcond2.log: libtool-macros.log
-ltconv.log: libtool-macros.log
-ltdeps.log: libtool-macros.log
-ltinit.log: libtool-macros.log
-ltinstloc.log: libtool-macros.log
-ltlibobjs.log: libtool-macros.log
-ltlibsrc.log: libtool-macros.log
-ltorder.log: libtool-macros.log
-nobase-libtool.log: libtool-macros.log
-pr211.log: libtool-macros.log
-pr300-ltlib.log: libtool-macros.log
-pr307.log: libtool-macros.log
-pr401b.log: libtool-macros.log
-pr72.log: libtool-macros.log
-reqd2.log: libtool-macros.log
-silent3.log: libtool-macros.log
-silent4.log: libtool-macros.log
-silent9.log: libtool-macros.log
-stdlib2.log: libtool-macros.log
-strip3.log: libtool-macros.log
-subobj9.log: libtool-macros.log
-suffix10.log: libtool-macros.log
-suffix2.log: libtool-macros.log
-suffix5.log: libtool-macros.log
-suffix8.log: libtool-macros.log
-vala.log: libtool-macros.log
-vala1.log: libtool-macros.log
-vala2.log: libtool-macros.log
-vala3.log: libtool-macros.log
-vala4.log: libtool-macros.log
-vala5.log: libtool-macros.log
-
-# FIXME: make these automatically computed once we are merged into
-# FIXME: the `testsuite-work' branch.
-gettext.log: gettext-macros.log
-gettext2.log: gettext-macros.log
-gettext3.log: gettext-macros.log
-subcond.log: gettext-macros.log
-
clean-local: clean-local-check
.PHONY: clean-local-check
clean-local-check:
diff --git a/tests/defs-static.in b/tests/defs-static.in
index af8f501..2bae9c1 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -99,6 +99,7 @@ fi
testsrcdir='@abs_srcdir@'
top_testsrcdir='@abs_top_srcdir@'
testbuilddir='@abs_builddir@'
+top_testbuilddir='@abs_top_builddir@'
testprefix='@prefix@'
# Support for the "installcheck" target.
diff --git a/tests/deleted-am.test b/tests/deleted-am.test
index fa41e9e..fa7c6ab 100755
--- a/tests/deleted-am.test
+++ b/tests/deleted-am.test
@@ -21,8 +21,6 @@
. ./defs || Exit 1
-set -e
-
echo AC_OUTPUT >> configure.in
echo 'include $(top_srcdir)/foobar.am' > Makefile.am
diff --git a/tests/deleted-m4.test b/tests/deleted-m4.test
index 6b0b9af..82db3f0 100755
--- a/tests/deleted-m4.test
+++ b/tests/deleted-m4.test
@@ -21,8 +21,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
m4_include([foobar.m4])
AC_OUTPUT
diff --git a/tests/dist-missing-am.test b/tests/dist-missing-am.test
index bb404bc..df9d579 100755
--- a/tests/dist-missing-am.test
+++ b/tests/dist-missing-am.test
@@ -21,8 +21,6 @@
. ./defs || Exit 1
-set -e
-
echo AC_OUTPUT >> configure.in
cat > Makefile.am <<'END'
diff --git a/tests/dist-missing-included-m4.test
b/tests/dist-missing-included-m4.test
index 56ba24c..4328417 100755
--- a/tests/dist-missing-included-m4.test
+++ b/tests/dist-missing-included-m4.test
@@ -22,8 +22,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
m4_include([foobar.m4])
m4_include([zardoz.m4])
diff --git a/tests/dist-missing-m4.test b/tests/dist-missing-m4.test
index a2618e9..02e95c7 100755
--- a/tests/dist-missing-m4.test
+++ b/tests/dist-missing-m4.test
@@ -22,8 +22,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
m4_pattern_forbid([^MY_])
MY_FOOBAR || exit 1
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index 6009dbc..51b634f 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -137,6 +137,16 @@ sub parse_options (@)
my %deps_extractor =
(
+ libtool_macros =>
+ {
+ line_matcher => qr/^\s*required=.*\blibtool/,
+ nodist_prereqs => "libtool-macros.log",
+ },
+ gettext_macros =>
+ {
+ line_matcher => qr/^\s*required=.*\bgettext/,
+ nodist_prereqs => "gettext-macros.log",
+ },
use_trivial_test_driver =>
{
line_matcher => qr/\btrivial-test-driver\b/,
@@ -246,35 +256,13 @@ my %test_generators =
parse_options @ARGV;
my @all_tests = get_list_of_tests;
+my @generated_tests = (); # Will be updated later.
print "## -*- Makefile -*-\n";
print "## Generated by $me. DO NOT EDIT BY HAND!\n\n";
print <<EOF;
-## ---------------------------------------------------- ##
-## Autogenerated dependencies for hand-written tests. ##
-## ---------------------------------------------------- ##
-
-EOF
-
-while (my ($k, $x) = each %deps_extractor)
- {
- my $dist_prereqs = $x->{dist_prereqs} || "";
- my $nodist_prereqs = $x->{nodist_prereqs} || "";
- my @tests = grep { line_match $x->{line_matcher}, $_ } @all_tests;
- map { s/\.[^.]*$//; s/$/\.log/; } (my @logs = @tests);
- print "## Added by deps-extracting key `$k'.\n";
- ## The list of all tests which have a dependency detected by the
- ## current key.
- print join(" \\\n ", "${k}_TESTS =", @tests) . "\n";
- print "EXTRA_DIST += $dist_prereqs\n";
- map { print "$_: $dist_prereqs $nodist_prereqs\n" } @logs;
- print "\n";
- }
-
-print <<EOF;
-
## --------------------------------------------- ##
## Autogenerated tests and their dependencies. ##
## --------------------------------------------- ##
@@ -296,13 +284,16 @@ while (my ($k, $g) = each %test_generators)
{
(my $base = $wrapped_test) =~ s/\.([^.]*)$//;
my $suf = $1 or die "$me: test `$wrapped_test' lacks a suffix\n";
+ my $wrapper_test = "$base-w.$suf";
+ # Register wrapper test as "autogenerated".
+ push @generated_tests, $wrapper_test;
# Create wrapper test.
- atomic_write "$base-w.$suf",
+ atomic_write $wrapper_test,
sub { write_wrapper_script $_[0], $wrapped_test,
$g->{shell_setup_code} },
0555;
# Update generated makefile fragment to account for it.
- print "generated_TESTS += $base-w.$suf\n";
+ print "generated_TESTS += $wrapper_test\n";
# The generated test works by sourcing the original test, so that
# it has to be re-run every time that changes ...
print "$base-w.log: $wrapped_test\n";
@@ -316,4 +307,35 @@ while (my ($k, $g) = each %test_generators)
}
}
+# The test scripts are scanned for automatic dependency generation *after*
+# the generated tests have been created, so they too can be scanned. To
+# do so correctly, we need to update the list in address@hidden' to make it
+# comprise also the freshly-generated tests.
+
+push @all_tests, @generated_tests;
+
+print <<EOF;
+
+## ----------------------------- ##
+## Autogenerated dependencies. ##
+## ----------------------------- ##
+
+EOF
+
+while (my ($k, $x) = each %deps_extractor)
+ {
+ my $dist_prereqs = $x->{dist_prereqs} || "";
+ my $nodist_prereqs = $x->{nodist_prereqs} || "";
+ my @tests = grep { line_match $x->{line_matcher}, $_ } @all_tests;
+ map { s/\.[^.]*$//; s/$/\.log/; } (my @logs = @tests);
+ print "## Added by deps-extracting key `$k'.\n";
+ ## The list of all tests which have a dependency detected by the
+ ## current key.
+ print join(" \\\n ", "${k}_TESTS =", @tests) . "\n";
+ print "EXTRA_DIST += $dist_prereqs\n";
+ map { print "$_: $dist_prereqs $nodist_prereqs\n" } @logs;
+ print "\n";
+ }
+
+
__END__
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 1a549a3..fe78d70 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -22,13 +22,6 @@
. ./defs || Exit 1
-set -e
-
-# FIXME: remove these once we are merged into master.
-top_testsrcdir=$testsrcdir/..
-testbuilddir=`(cd .. && pwd)`
-top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
-
st=0
sed 20q "$top_testsrcdir/ChangeLog" || st=1
$PERL -V || st=1
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index 6b8e8ca..bf9330f 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -77,11 +77,11 @@ test ! -d "$instdir"
test ! -d "$destdir"
$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && Exit 1
$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && Exit 1
:
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 3e77b10..5e7c6a1 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -76,11 +76,11 @@ test ! -d "$instdir"
test ! -d "$destdir"
$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && Exit 1
$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
cat stdout
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && Exit 1
:
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index 3e2bcfd..4a00aef 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -149,7 +149,9 @@ END
## TESTS ##
cat >> Makefile.am <<'END'
-## FIXME: Use AM_TESTS_ENVIRONMENT here when it becomes available.
+## We must use `TESTS_ENVIRONMENT', not `AM_TESTS_ENVIRONMENT',
+## because the latter is not hnoured by the old serial test
+## harness.
TESTS_ENVIRONMENT = \
if test x"$$jprog_doing_installcheck" != x"yes"; then \
jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
diff --git a/tests/java-compile-run-nested.test
b/tests/java-compile-run-nested.test
index dbdf4a1..30bd6a0 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -162,8 +162,7 @@ END
mkdir tests
cat > tests/Makefile.am <<'END'
-## FIXME: Use AM_TESTS_ENVIRONMENT here when it becomes available.
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
if test x"$$jprog_doing_installcheck" != x"yes"; then \
jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
export jprog_classpath; \
diff --git a/tests/makefile-deps.test b/tests/makefile-deps.test
index 819c7d3..bfe0d67 100755
--- a/tests/makefile-deps.test
+++ b/tests/makefile-deps.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
: > Makefile.am
$ACLOCAL
diff --git a/tests/missing-tar.test b/tests/missing-tar.test
index 889ae20..72c7f07 100755
--- a/tests/missing-tar.test
+++ b/tests/missing-tar.test
@@ -14,17 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test how the `missing' script wraps the`tar' program .
-# FIXME: we should also try to run the `missing' script with the
-# $CONFIG_SHELL ...
+# Test how the `missing' script wraps the`tar' program.
. ./defs || Exit 1
-set -e
-
-# FIXME: make this working with "installcheck" too ...
-cp "$testsrcdir"/../lib/missing . \
- || fatal_ "failed to fetch auxiliary script \`missing'"
+get_shell_script "missing"
old_PATH=$PATH; export old_PATH
new_PATH=`pwd`/bin$PATH_SEPARATOR$PATH
diff --git a/tests/parallel-tests-console-output.test
b/tests/parallel-tests-console-output.test
index 63dd749..93c2429 100755
--- a/tests/parallel-tests-console-output.test
+++ b/tests/parallel-tests-console-output.test
@@ -61,7 +61,7 @@ cat > xfail.test << 'END'
#!/bin/sh
# The sleep should ensure expected execution order of tests
# even when make is run in parallel mode.
-# FIXME: quotes below required by maintainer-check.
+# Creative quoting below to plase maintainer-check.
sleep '10'
exit 1
END
diff --git a/tests/parallel-tests-dry-run.test
b/tests/parallel-tests-dry-run.test
index 4791598..3a136f4 100755
--- a/tests/parallel-tests-dry-run.test
+++ b/tests/parallel-tests-dry-run.test
@@ -58,7 +58,7 @@ for target in check recheck test-suite.log; do
test ! -f test-suite.log
done
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
echo exit '0' > foo.test
echo exit '1' > bar.test
@@ -72,7 +72,7 @@ test -f foo.trs
test -f foo.log
test -f bar.trs
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
cat > foo.test <<END
echo this is bad
exit 1
diff --git a/tests/parallel-tests-no-color-in-log.test
b/tests/parallel-tests-no-color-in-log.test
index 97ef19d..b69d6e1 100755
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/tests/parallel-tests-no-color-in-log.test
@@ -26,7 +26,7 @@ esc=''
# GNU or BSD 'grep -a' works on files, but is not portable.
case `echo "$esc" | $FGREP "$esc"` in
"$esc") ;;
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
*) echo "$me: f""grep can't parse nonprinting characters" >&2; Exit 77;;
esac
@@ -43,7 +43,7 @@ TESTS = pass fail skip xpass xfail error
XFAIL_TESTS = xpass xfail
END
-# FIXME: creative quoting to please maintainer-check.
+# Creative quoting to please maintainer-check.
echo exit '0' > pass
echo exit '0' > xpass
echo exit '1' > fail
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index 69ce1c1..d5275a8 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -38,7 +38,7 @@ for i in 1 2 3 4 5 6 7 8; do
unindent >foo$i.test <<'END'
#! /bin/sh
echo "this is $0"
- # FIXME: spurious quote to please maintainer-check
+ # Creative quoting below to please maintainer-check.
sleep '1'
exit 0
END
diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test
index 888c9dd..064cfe5 100755
--- a/tests/remake-am-pr10111.test
+++ b/tests/remake-am-pr10111.test
@@ -24,8 +24,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
AC_OUTPUT
END
diff --git a/tests/remake-deleted-am-2.test b/tests/remake-deleted-am-2.test
index 07142f6..07a419d 100755
--- a/tests/remake-deleted-am-2.test
+++ b/tests/remake-deleted-am-2.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
echo AC_OUTPUT >> configure.in
$ACLOCAL
diff --git a/tests/remake-deleted-am-subdir.test
b/tests/remake-deleted-am-subdir.test
index 9ed1078..32b6f37 100755
--- a/tests/remake-deleted-am-subdir.test
+++ b/tests/remake-deleted-am-subdir.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
AC_OUTPUT
diff --git a/tests/remake-deleted-am.test b/tests/remake-deleted-am.test
index fa5a672..3af9c0c 100755
--- a/tests/remake-deleted-am.test
+++ b/tests/remake-deleted-am.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
echo AC_OUTPUT >> configure.in
$ACLOCAL
diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test
index 2d89c25..5aa57ba 100755
--- a/tests/remake-m4-pr10111.test
+++ b/tests/remake-m4-pr10111.test
@@ -24,8 +24,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in <<'END'
m4_include([foobar.m4])
AC_OUTPUT
diff --git a/tests/remake-renamed-am.test b/tests/remake-renamed-am.test
index b3a7a41..6c04135 100755
--- a/tests/remake-renamed-am.test
+++ b/tests/remake-renamed-am.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
echo AC_OUTPUT >> configure.in
cat > Makefile.am <<'END'
diff --git a/tests/tap-deps.test b/tests/tap-deps.test
index 74612ed..dde1208 100755
--- a/tests/tap-deps.test
+++ b/tests/tap-deps.test
@@ -33,7 +33,8 @@ cat > a.test << 'END'
#!/bin/sh
echo 1..2
echo ok 1
-sleep '3' # FIXME: quotes to please maintainer-check
+# Creative quoting below to please maintainer-check.
+sleep '3'
echo ok 2
: > a.run
END
@@ -46,7 +47,8 @@ if test -f a.run; then
else
echo not ok 1
fi
-sleep '3' # FIXME: quotes to please maintainer-check
+# Creative quoting below to please maintainer-check.
+sleep '3'
echo ok 2
: > b.run
END
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index 1b3d239..dd4621c 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -18,7 +18,7 @@
# - testsuite progress on console should happen mostly "in real time";
# i.e., it's not acceptable for the driver to wait the end of the
# script to start displaying results from it.
-# FIXME: this test uses expect(1) to ensure line buffering from make and
+# FIXME: this test uses expect(1) to ensure line buffering from make and
# children, and is pretty hacky and complex; is there a better way to
# accomplish the checks done here?
@@ -44,7 +44,7 @@ cat > all.test <<'END'
#! /bin/sh
echo 1..3
-# FIXME: creative quoting to placate maintainer-check
+# Creative quoting to placate maintainer-check
sleep="sleep "3
# The awk+shell implementation of the TAP driver must "read ahead" of one
diff --git a/tests/test-trs-recover.test b/tests/test-trs-recover.test
index fe12a4e..e498688 100755
--- a/tests/test-trs-recover.test
+++ b/tests/test-trs-recover.test
@@ -31,7 +31,7 @@ TESTS = foo.test bar.test baz.test
TEST_LOG_COMPILER = $(SHELL)
END
-# FIXME: creative quoting below to please maintainer-check.
+# Creative quoting below to please maintainer-check.
echo exit '$TEST_STATUS' > foo.test
echo exit '$TEST_STATUS' > bar.test
: > baz.test
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1636-gc3bcf99,
Stefano Lattarini <=