[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-624-g40d140a |
|
Date: |
Tue, 24 Jul 2012 22:46:47 +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=40d140a6569ff4ec9b8619cb9d1cbefbc13e59b8
The branch, ng/master has been updated
via 40d140a6569ff4ec9b8619cb9d1cbefbc13e59b8 (commit)
via e3d6f0427bec781d524aa43ad058748d0fe8ea3b (commit)
via 06143bdbbf8c3d358d51b646165634473c193afe (commit)
via fd2524171194ab00e7f7cad768bd6753a38ecab9 (commit)
via e3e58b6c41c0df669129ba7988273b7b944ae56c (commit)
via 3c774c5eb56ee1c538d9f153d941dd4596de2db3 (commit)
via f3af1eb0c7926a203839c9d06fa3e368d5ff4103 (commit)
via 3ffce6240040e51a60fc5a40cbb8d669baa5f7b5 (commit)
via 2d5571e7dbfb41eec4a2657c4c076257a320d496 (commit)
via 158b46f23ea71c9c96e1f298e69cdc9822bcfc46 (commit)
from 13333d938e6cc581dd6fd5e5ea32aa2d0ffeb7f3 (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 40d140a6569ff4ec9b8619cb9d1cbefbc13e59b8
Author: Stefano Lattarini <address@hidden>
Date: Wed Jul 25 00:30:22 2012 +0200
[ng] tests: fix spurious failure in 'color-tests2.sh'
* t/color-tests2.sh: Change the idioms used to specify the value of
'AM_COLOR_TESTS' to make. This is required since, in contrast with
what happens in the mainline Automake counterpart, this script doesn't
invoke make with the '-e' option.
Signed-off-by: Stefano Lattarini <address@hidden>
commit e3d6f0427bec781d524aa43ad058748d0fe8ea3b
Merge: 13333d9 06143bd
Author: Stefano Lattarini <address@hidden>
Date: Wed Jul 25 00:14:09 2012 +0200
Merge branch 'master' into ng/master
* master:
tests: avoid non-textual output in a '.log' file
tags: refactor to reduce code duplication (2)
tags: refactor to reduce code duplication (1)
tests: better name for a couple of tests
check: support colorized testsuite output by default
tags: unify recursion for tags targets with that of "usual" targets
+ Extra non-trivial edits:
* automake.in (handle_tests): Drop the '%COLOR%' transform in the
processing of both 'serial-tests.am' and 'parallel-tests.am', which
have superseded the 'check.am' from mainline Automake.
* lib/am/color-tests.am: Remove use of the '%?COLOR%' transform;
just act as if it were unconditionally TRUE.
(am__tty_colors_dummy): Merge into ...
(am__tty_colors): ... this.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NEWS | 11 ++++
automake.in | 82 ++++++++----------------------
doc/automake-ng.texi | 37 +++++--------
lib/am/color-tests.am | 12 ++---
lib/am/tags.am | 97 ++++++++++++++++++-----------------
t/ax/tap-summary-aux.sh | 1 -
t/ax/testsuite-summary-checks.sh | 4 +-
t/{exdir3.sh => color-tests-opt.sh} | 26 +++++----
t/{color.sh => color-tests.sh} | 1 -
t/{color2.sh => color-tests2.sh} | 20 ++++++-
t/dist-formats.tap | 9 +++-
t/maken3.sh | 10 ++--
t/tap-realtime.sh | 2 +
13 files changed, 148 insertions(+), 164 deletions(-)
copy t/{exdir3.sh => color-tests-opt.sh} (68%)
rename t/{color.sh => color-tests.sh} (98%)
rename t/{color2.sh => color-tests2.sh} (85%)
diff --git a/NEWS b/NEWS
index 71771cf..0df7b2d 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,13 @@ New in 1.13:
testsuite harness will still be available through the use of the
'serial-tests' option (introduced in Automake 1.12).
+ - The 'color-tests' option is now unconditionally activated by default.
+ In particular, this means that testsuite output is now colorized by
+ default if the attached terminal seems to support ANSI escapes, and
+ that the user can force output colorization by setting the variable
+ AM_COLOR_TESTS to "always". The 'color-tests' is still recognized
+ for backward-compatibility, although it's a handled as a no-op now.
+
* Silent rules support:
- Support for silent rules is now always active in Automake-generated
@@ -91,6 +98,10 @@ New in 1.13:
specifying the name of such targets in invocations of the new
'AM_EXTRA_RECURSIVE_TARGETS' m4 macro.
+ - Any failure in the recipe of the "tags", "ctags", "cscope" or
+ "cscopelist" targets in a subdirectory is now propagated to the
+ top-level make invocation.
+
* Improvements to aclocal and related rebuilds rules:
- The Autoconf-provided macro AC_CONFIG_MACRO_DIR is now traced by
diff --git a/automake.in b/automake.in
index 2d268eb..17ec3ab 100644
--- a/automake.in
+++ b/automake.in
@@ -477,9 +477,11 @@ my %required_targets =
'install-ps-am' => 1,
'install-info-am' => 1,
'installcheck-am' => 1,
- 'uninstall-am' => 1,
-
- 'install-man' => 1,
+ 'uninstall-am' => 1,
+ 'tags-am' => 1,
+ 'ctags-am' => 1,
+ 'cscopelist-am' => 1,
+ 'install-man' => 1,
);
# Queue to push require_conf_file requirements to.
@@ -3197,66 +3199,26 @@ sub handle_tags
qw/$(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)/,
@config);
- my @tag_deps = ();
- my @ctag_deps = ();
- my @cscope_deps = ();
- if (var ('SUBDIRS'))
- {
- $output_rules .= ("tags-recursive:\n"
- . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do
\\\n"
- # Never fail here if a subdir fails; it
- # isn't important.
- . "\t test \"\$\$subdir\" = . || (cd \$\$subdir"
- . " && \$(MAKE) tags); \\\n"
- . "\tdone\n");
- push (@tag_deps, 'tags-recursive');
- &depend ('.PHONY', 'tags-recursive');
-
- $output_rules .= ("ctags-recursive:\n"
- . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do
\\\n"
- # Never fail here if a subdir fails; it
- # isn't important.
- . "\t test \"\$\$subdir\" = . || (cd \$\$subdir"
- . " && \$(MAKE) ctags); \\\n"
- . "\tdone\n");
- push (@ctag_deps, 'ctags-recursive');
- &depend ('.PHONY', 'ctags-recursive');
-
- $output_rules .= ("cscopelist-recursive:\n"
- . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do
\\\n"
- # Never fail here if a subdir fails; it
- # isn't important.
- . "\t test \"\$\$subdir\" = . || (cd \$\$subdir"
- . " && \$(MAKE) cscopelist); \\\n"
- . "\tdone\n");
- push (@cscope_deps, 'cscopelist-recursive');
- &depend ('.PHONY', 'cscopelist-recursive');
- }
-
if (rvar('am__tagged_files')->value_as_list_recursive
- || var ('ETAGS_ARGS') || @tag_deps)
- {
- $output_rules .= &file_contents ('tags',
- new Automake::Location,
- TAGSDIRS => "@tag_deps",
- CTAGSDIRS => "@ctag_deps",
- CSCOPEDIRS => "@cscope_deps");
- }
- elsif (reject_var ('TAGS_DEPENDENCIES',
- "it doesn't make sense to define 'TAGS_DEPENDENCIES'"
- . " without\nsources or 'ETAGS_ARGS'"))
- {
- }
+ || var ('ETAGS_ARGS') || var ('SUBDIRS'))
+ {
+ $output_rules .= &file_contents ('tags', new Automake::Location);
+ set_seen 'TAGS_DEPENDENCIES';
+ }
else
- {
+ {
+ reject_var ('TAGS_DEPENDENCIES',
+ "it doesn't make sense to define 'TAGS_DEPENDENCIES'"
+ . " without\nsources or 'ETAGS_ARGS'");
# Every Makefile must define some sort of TAGS rule.
# Otherwise, it would be possible for a top-level "make TAGS"
- # to fail because some subdirectory failed.
- $output_rules .= "tags: TAGS\nTAGS:\n\n";
- # Ditto ctags and cscope.
- $output_rules .= "ctags: CTAGS\nCTAGS:\n\n";
- $output_rules .= "cscope cscopelist:\n\n";
- }
+ # to fail because some subdirectory failed. Ditto ctags and
+ # cscope.
+ $output_rules .=
+ "tags TAGS:\n\n" .
+ "ctags CTAGS:\n\n" .
+ "cscope cscopelist:\n\n";
+ }
}
@@ -4145,7 +4107,6 @@ sub handle_tests
{
$output_rules .=
file_contents ('serial-tests', new Automake::Location,
- COLOR => !! option 'color-tests',
CHECK_DEPS => "@check");
}
else
@@ -4154,7 +4115,6 @@ sub handle_tests
require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
$output_rules .=
file_contents ('parallel-tests', new Automake::Location,
- COLOR => !! option 'color-tests',
CHECK_DEPS => "@check");
}
}
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 1acb622..64a31c2 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -8810,18 +8810,18 @@ run.
@anchor{Simple tests and color-tests}
@vindex AM_COLOR_TESTS
@cindex Colorized testsuite output
-If the Automake option @code{color-tests} is used (@pxref{Options})
-and standard output is connected to a capable terminal, then the test
-results and the summary are colored appropriately. The user can disable
-colored output by setting the @command{make} variable
address@hidden, or force colored output even without a connecting
-terminal with @samp{AM_COLOR_TESTS=always}. It's also worth noting that
-some @command{make} implementations, when used in parallel mode, have
-slightly different semantics (@pxref{Parallel make,,, autoconf,
-The Autoconf Manual}), which can break the automatic detection of a
-connection to a capable terminal. If this is the case, you'll have to
-resort to the use of @samp{AM_COLOR_TESTS=always} in order to have the
-testsuite output colorized.
+If the standard output is connected to a capable terminal, then the test
+results and the summary are colored appropriately. The developer and the
+user can disable colored output by setting the @command{make} variable
address@hidden; the user can in addition force colored output
+even without a connecting terminal with @samp{AM_COLOR_TESTS=always}.
+It's also worth noting that some @command{make} implementations,
+when used in parallel mode, have slightly different semantics
+(@pxref{Parallel make,,, autoconf, The Autoconf Manual}), which can
+break the automatic detection of a connection to a capable terminal.
+If this is the case, the user will have to resort to the use of
address@hidden in order to have the testsuite output
+colorized.
Test programs that need data files should look for them in @code{srcdir}
(which is both a make variable and an environment variable made available
@@ -9245,9 +9245,9 @@ definition of generic and extension-specific
@code{LOG_COMPILER} and
@end itemize
@noindent
-On the other hand, the exact semantics of how (and if)
address@hidden, @code{XFAIL_TESTS}, and hard errors are supported
-and handled is left to the individual test drivers.
+On the other hand, the exact semantics of how (and if) testsuite output
+colorization, @code{XFAIL_TESTS}, and hard errors are supported and
+handled is left to the individual test drivers.
@c TODO: We should really add a working example in the doc/ directory,
@c TODO: and reference if from here.
@@ -9939,13 +9939,6 @@ implies options @option{readme-alpha} and
@option{check-news}.
Cause @samp{make dist} to fail unless the current version number appears
in the first few lines of the @file{NEWS} file.
address@hidden @option{color-tests}
address@hidden Option, @option{color-tests}
address@hidden color-tests
-Cause output of the serial and parallel test harnesses (see @ref{Simple
-Tests}) and of properly-written custom test drivers (@pxref{Custom Test
-Drivers}) to be colorized on capable terminals.
-
@item @option{dejagnu}
@cindex Option, @option{dejagnu}
@opindex dejagnu
diff --git a/lib/am/color-tests.am b/lib/am/color-tests.am
index db91049..d2e2a7d 100644
--- a/lib/am/color-tests.am
+++ b/lib/am/color-tests.am
@@ -14,12 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
-am__tty_colors_dummy = \
- mgn= red= grn= lgn= blu= brg= std=; \
- am__color_tests=no
-if %?COLOR%
am__tty_colors = { \
- $(am__tty_colors_dummy); \
if test "X$(AM_COLOR_TESTS)" = Xno; then \
am__color_tests=no; \
elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
@@ -29,6 +24,8 @@ am__tty_colors = { \
## redirect stdout here, just stderr.
elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
am__color_tests=yes; \
+ else \
+ am__color_tests=no; \
fi; \
if test $$am__color_tests = yes; then \
red='[0;31m'; \
@@ -38,8 +35,7 @@ am__tty_colors = { \
mgn='[0;35m'; \
brg='[1m'; \
std='[m'; \
+ else \
+ mgn= red= grn= lgn= blu= brg= std=; \
fi; \
}
-else !%?COLOR%
-am__tty_colors = $(am__tty_colors_dummy)
-endif !%?COLOR%
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 2abd563..1db4139 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -14,20 +14,31 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+## Handle VPATH correctly.
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+
## ---- ##
## ID. ##
## ---- ##
ID: $(am__tagged_files)
-## Make sure the list of sources is unique.
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
-## Handle VPATH correctly.
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
## ------ ##
@@ -35,13 +46,17 @@ ID: $(am__tagged_files)
## ------ ##
ETAGS = etags
-.PHONY: tags
+.PHONY: TAGS tags
if %?SUBDIRS%
-AM_RECURSIVE_TARGETS += tags TAGS
-endif %?SUBDIRS%
-tags: TAGS
-
-TAGS: %TAGSDIRS% $(TAGS_DEPENDENCIES) $(am__tagged_files)
+AM_RECURSIVE_TARGETS += TAGS
+RECURSIVE_TARGETS += tags-recursive
+tags: tags-recursive
+else !%?SUBDIRS%
+tags: tags-am
+endif !%?SUBDIRS%
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
## We use the positional parameters to build the subdir list with
## absolute names, without the need to worry about white space in `pwd`.
set x; \
@@ -66,14 +81,7 @@ TAGS: %TAGSDIRS% $(TAGS_DEPENDENCIES) $(am__tagged_files)
?SUBDIRS? set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
?SUBDIRS? fi; \
?SUBDIRS? done; \
-## Make sure the list of sources is unique.
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
-## Handle VPATH correctly.
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
## Remove the 'x' we added first:
shift; \
## Make sure we have something to run etags on.
@@ -96,22 +104,16 @@ TAGS: %TAGSDIRS% $(TAGS_DEPENDENCIES) $(am__tagged_files)
CTAGS = ctags
.PHONY: CTAGS ctags
if %?SUBDIRS%
-AM_RECURSIVE_TARGETS += ctags CTAGS
-endif %?SUBDIRS%
-ctags: CTAGS
-
-## We have a dummy name here because 'tags' has already been in use
-## for a long time to mean Emacs-style tags. Oops. This means the
-## dependencies here are useless.
-CTAGS: %CTAGSDIRS% $(TAGS_DEPENDENCIES) $(am__tagged_files)
-## Make sure the list of sources is unique.
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
-## Handle VPATH correctly.
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+AM_RECURSIVE_TARGETS += CTAGS
+RECURSIVE_TARGETS += ctags-recursive
+ctags: ctags-recursive
+else !%?SUBDIRS%
+ctags: ctags-am
+endif !%?SUBDIRS%
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
## Make sure we have something to run ctags on.
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
@@ -134,24 +136,25 @@ GTAGS:
## ------- ##
if %?TOPDIR_P%
-
CSCOPE = cscope
.PHONY: cscope clean-cscope
AM_RECURSIVE_TARGETS += cscope
-
cscope: cscope.files
test ! -s cscope.files \
|| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files
$(CSCOPE_ARGS)
-
clean-cscope:
rm -f cscope.files
-
-cscope.files: clean-cscope %CSCOPEDIRS% cscopelist
-
+cscope.files: clean-cscope cscopelist
endif %?TOPDIR_P%
-.PHONY: cscopelist
-cscopelist: %CSCOPEDIRS% $(am__tagged_files)
+if %?SUBDIRS%
+RECURSIVE_TARGETS += cscopelist-recursive
+cscopelist: cscopelist-recursive
+else !%?SUBDIRS%
+cscopelist: cscopelist-am
+endif !%?SUBDIRS%
+
+cscopelist-am: $(am__tagged_files)
list='$(am__tagged_files)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 2a04616..6148553 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -89,7 +89,6 @@ if test $use_colors = yes; then
mgn="$esc[0;35m"
brg="$esc[1m"
std="$esc[m"
- echo AUTOMAKE_OPTIONS = color-tests >> Makefile.am
else
red= grn= lgn= blu= mgn= brg= std=
fi
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index d31a94c..9268079 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -28,10 +28,8 @@ case $use_colors in
# Forced colorization should take place also with non-ANSI
# terminals; hence this setting.
TERM=dumb; export TERM
- am_opts='color-tests'
;;
no)
- am_opts=''
;;
*)
fatal_ "invalid use_colors='$use_colors'";;
@@ -39,7 +37,7 @@ esac
cat > configure.ac <<END
AC_INIT([GNU AutoFoo], [7.1], address@hidden)
-AM_INIT_AUTOMAKE([$am_opts])
+AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
diff --git a/t/exdir3.sh b/t/color-tests-opt.sh
similarity index 68%
copy from t/exdir3.sh
copy to t/color-tests-opt.sh
index 6d602cb..87d88c9 100755
--- a/t/exdir3.sh
+++ b/t/color-tests-opt.sh
@@ -14,22 +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/>.
-# Test to make sure pkgdatadir can be overridden via AC_SUBST.
+# Check that the 'color-tests' option, now active by default, is
+# nonetheless still silently accepted, for backward compatibility.
. ./defs || exit 1
-cat >>configure.ac <<'EOF'
-AC_SUBST([pkgdatadir], ["FOO"])
+cat >configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([color-tests])
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT
-EOF
+END
-cat > Makefile.am << 'EOF'
-showme:
- @echo $(pkgdatadir)
-EOF
+cat >Makefile.am <<END
+AUTOMAKE_OPTIONS = color-tests
+TESTS = foo.test
+END
+
+: > test-driver
$ACLOCAL
-$AUTOCONF
$AUTOMAKE
-./configure
-$MAKE showme | grep FOO
+
+:
diff --git a/t/color.sh b/t/color-tests.sh
similarity index 98%
rename from t/color.sh
rename to t/color-tests.sh
index 9b3b3bc..666fd40 100755
--- a/t/color.sh
+++ b/t/color-tests.sh
@@ -34,7 +34,6 @@ AC_OUTPUT
END
cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = color-tests
TESTS = $(check_SCRIPTS)
check_SCRIPTS = pass fail skip xpass xfail error
XFAIL_TESTS = xpass xfail
diff --git a/t/color2.sh b/t/color-tests2.sh
similarity index 85%
rename from t/color2.sh
rename to t/color-tests2.sh
index 18734c9..c66dbe5 100755
--- a/t/color2.sh
+++ b/t/color-tests2.sh
@@ -35,12 +35,14 @@ std="$esc\[m"
# Do the tests.
-cat >>configure.ac <<END
+cat >>configure.ac << 'END'
+if $testsuite_colorized; then :; else
+ AC_SUBST([AM_COLOR_TESTS], [no])
+fi
AC_OUTPUT
END
cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = color-tests
TESTS = $(check_SCRIPTS)
check_SCRIPTS = pass fail skip xpass xfail error
XFAIL_TESTS = xpass xfail
@@ -128,11 +130,23 @@ for vpath in false :; do
cat stdout
test_no_color
- AM_COLOR_TESTS=no MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+ MAKE="$MAKE AM_COLOR_TESTS=no" expect -f $srcdir/expect-make >stdout \
|| { cat stdout; exit 1; }
cat stdout
test_no_color
+ $srcdir/configure testsuite_colorized=false
+
+ TERM=ansi MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+ || { cat stdout; exit 1; }
+ cat stdout
+ test_no_color
+
+ TERM=ansi MAKE="$MAKE AM_COLOR_TESTS=always" \
+ expect -f $srcdir/expect-make >stdout || { cat stdout; exit 1; }
+ cat stdout
+ test_color
+
$MAKE distclean
cd $srcdir
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 4d86add..2746fae 100755
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -78,9 +78,16 @@ have_compressor ()
return 1
;;
*)
+ case $1 in
+ # Do not use --version, or older versions bzip2 would try to
+ # compress stdin. This would cause binary output in the test
+ # logs, with potential breakage of our testsuite harness.
+ bzip2) o=--help;;
+ *) o=--version;;
+ esac
# Redirect to stderr to avoid polluting the output, in case this
# function is used in a command substitution (as it is, below).
- if $1 --version </dev/null >&2; then
+ if $1 $o </dev/null >&2; then
return 0
else
return 1
diff --git a/t/maken3.sh b/t/maken3.sh
index b1875cb..5dbe7d2 100755
--- a/t/maken3.sh
+++ b/t/maken3.sh
@@ -20,7 +20,7 @@
# 2. the output from make is sufficiently complete.
#
# This test exercises the GCS-mandated targets (except for dist)
-# as well as tags, TAGS.
+# as well as tags.
# For gen-testsuite-part: ==> try-with-serial-tests <==
. ./defs || exit 1
@@ -94,8 +94,6 @@ installcheck-local:
@: > stamp-installcheck-sub
tags:
@: > stamp-tags-sub
-TAGS:
- @: > stamp-TAGS-sub
mostlyclean-local:
@: > stamp-mostlyclean-sub
maintainer-clean-local:
@@ -110,7 +108,7 @@ html:
@: > address@hidden
install-info install-html install-dvi install-pdf install-ps:
@: > address@hidden
-installcheck installdirs tags TAGS mostlyclean:
+installcheck installdirs tags mostlyclean:
@: > address@hidden
## These targets cannot be overridden like this:
## install-strip distclean maintainer-clean
@@ -125,12 +123,12 @@ check_targets ()
all install install-strip uninstall clean distclean check \
info html dvi pdf ps \
install-info install-html install-dvi install-pdf install-ps \
- installcheck installdirs tags TAGS mostlyclean maintainer-clean
+ installcheck installdirs tags mostlyclean maintainer-clean
do
$MAKE -n $target >stdout || { cat stdout; exit 1; }
cat stdout
case $target in
- install-* | installdirs | tags | TAGS ) ;;
+ install-* | installdirs | tags ) ;;
*)
grep "stamp-$target$" stdout || exit 1
test ! -e "stamp-$target" || exit 1
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
index e3cac34..6621053 100755
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
@@ -36,7 +36,9 @@ rm -f expect-check
cat > Makefile.am << 'END'
TESTS = all.test
+AM_COLOR_TESTS= no
END
+
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-624-g40d140a,
Stefano Lattarini <=