From unknown Sun Jun 22 00:48:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11855: Enabling the 'color-tests' option by default Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Wed, 04 Jul 2012 16:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11855 X-GNU-PR-Package: automake X-GNU-PR-Keywords: To: 11855@debbugs.gnu.org X-Debbugs-Original-To: bug-automake@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.134141966232554 (code B ref -1); Wed, 04 Jul 2012 16:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2012 16:34:22 +0000 Received: from localhost ([127.0.0.1]:48199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SmSWz-0008T1-Hn for submit@debbugs.gnu.org; Wed, 04 Jul 2012 12:34:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57355) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SmSWx-0008Su-Mj for submit@debbugs.gnu.org; Wed, 04 Jul 2012 12:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmSSC-0007SS-K3 for submit@debbugs.gnu.org; Wed, 04 Jul 2012 12:29:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:33804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmSSC-0007SL-Ed for submit@debbugs.gnu.org; Wed, 04 Jul 2012 12:29:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmSSA-0007Gv-VL for bug-automake@gnu.org; Wed, 04 Jul 2012 12:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmSS6-0007S0-95 for bug-automake@gnu.org; Wed, 04 Jul 2012 12:29:22 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:53146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmSS5-0007Ro-W6 for bug-automake@gnu.org; Wed, 04 Jul 2012 12:29:18 -0400 Received: by bkcjc3 with SMTP id jc3so4582470bkc.0 for ; Wed, 04 Jul 2012 09:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:mime-version:to:subject:content-type :content-transfer-encoding; bh=RliDGtqot1HXjIEhHdUUsxeaRHY56bX1Cy62e5WOuEw=; b=hyq/mFZf+O9s899P9HYoAzS1gcmxygE/ksCfcQwQKHhV2JaxDgFy/L3g9B1+y4D3su RajiTXjJkTiv4U98p3L1z6jgOZQ81efMs2P6E83/KxM3vwY/TUgLNJc0ksDEDOkBlr25 RM0lLv2kWFgBPNHa834mD/upSUL4PouJ8IyZTU4mXJ/lobSQogH0/mc4W9bCcU14NGPC 6gl4mhuWyRj+e/WSLypYDTodKy1ORK+kirWxJVfAHfA3CNhwIT5XWCJNOcpa/u0EKjaX 0dWdEzCHfdB38sJ6MqRBFCH13lv6lzTMrS6qUcf4uWUwzCt7fu6hzGRQS2eSz6Gd0OYS xkvg== Received: by 10.204.148.74 with SMTP id o10mr12336921bkv.111.1341419355806; Wed, 04 Jul 2012 09:29:15 -0700 (PDT) Received: from [82.58.50.2] (host2-50-dynamic.58-82-r.retail.telecomitalia.it. [82.58.50.2]) by mx.google.com with ESMTPS id ha10sm14806557bkc.3.2012.07.04.09.29.14 (version=SSLv3 cipher=OTHER); Wed, 04 Jul 2012 09:29:14 -0700 (PDT) Message-ID: <4FF46F52.70907@gmail.com> Date: Wed, 04 Jul 2012 18:29:06 +0200 From: Stefano Lattarini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.1 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.1 (------) Severity: wishlist Hello automakers. Anyone has an idea about why the 'color-tests' option should be not enabled by default (apart from the obvious historical reasons, that is)? Even when this option is on, the developer is free to disable testsuite coloring on a per-makefile basis (by adding "AM_COLOR_TESTS = no" to the Makefile.am) or on a whole-project basis (by AC_SUBST'ing AM_COLOR_TESTS to "no" in configure.ac). And the best thing about these approaches is that they still allow the user to request the testsuite output to be colorized, if he really wants to: # With GNU make: make AM_COLOR_TESTS=yes check # With non-GNU make: make AM_COLOR_TESTS=yes AM_MAKEFLAGS=AM_COLOR_TESTS=yes check So I think we should make the 'color-tests' option enabled by default (while keeping it around as a no-op, for backward-compatibility), and document the two tricks above for developers who (for one reason or another) don't want testsuite colorization enabled by default. WDYT? Regards, Stefano From unknown Sun Jun 22 00:48:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11855: [PATCH 0/2] Enable colorized testsuite output by default Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Sun, 22 Jul 2012 15:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11855 X-GNU-PR-Package: automake X-GNU-PR-Keywords: To: 11855@debbugs.gnu.org Cc: automake-patches@gnu.org Received: via spool by 11855-submit@debbugs.gnu.org id=B11855.134297149010816 (code B ref 11855); Sun, 22 Jul 2012 15:39:02 +0000 Received: (at 11855) by debbugs.gnu.org; 22 Jul 2012 15:38:10 +0000 Received: from localhost ([127.0.0.1]:57773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsyET-0002oO-DX for submit@debbugs.gnu.org; Sun, 22 Jul 2012 11:38:10 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:43137) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsyES-0002oG-13 for 11855@debbugs.gnu.org; Sun, 22 Jul 2012 11:38:08 -0400 Received: by bkty7 with SMTP id y7so4009216bkt.3 for <11855@debbugs.gnu.org>; Sun, 22 Jul 2012 08:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=+PPwlwJ/JBFkx2UNKDDEXnfmvmxXA1ug2Hlef0FXtC4=; b=IcdcDERFhWxH7+Ga0oP56ITStL5Y3/6P5VK3Dj+iGAS7ZkyAOFJlVIsrpTPm45d9sh s/dphaj6IdTPfAgq9WRuSQBhLMHqnniKwzRkP0WjchgEelNaGgdh1yt0lcmBSjgG17AZ oOK35HC3MInSL6PST4b6X1WQQNoXpAj2XbPhJj+RcIRAjFWPxj9TZ+Cw3BnreaxyMlc3 Iw7qEAKtn3TARRX83dAovD3UuqFYqoHrkxgyQ0mcNNVhLDmUTf10JUy6JojYdDdbYJ+Y fX/Z1Nu+xWHhUvUiqP3BgkRsUr5IWZTDkRs/ybP79sVhJcpnJX5lDDvh0hfiWwaqpPgN XxPA== Received: by 10.205.122.147 with SMTP id gg19mr6015966bkc.73.1342971097586; Sun, 22 Jul 2012 08:31:37 -0700 (PDT) Received: from localhost.localdomain (host105-96-dynamic.4-87-r.retail.telecomitalia.it. [87.4.96.105]) by mx.google.com with ESMTPS id hs2sm5247127bkc.1.2012.07.22.08.31.36 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 08:31:36 -0700 (PDT) From: Stefano Lattarini Date: Sun, 22 Jul 2012 17:31:25 +0200 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <4FF46F52.70907@gmail.com> References: <4FF46F52.70907@gmail.com> X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) Reference: The actual implementation is done by the first patch. The second on is just a minor testsuite cleanup "while we are at it". I intend to push this series by tomorrow. Regards, Stefano Stefano Lattarini (2): check: support colorized testsuite output by default tests: better name for a couple of tests NEWS | 7 +++++++ automake.in | 1 - doc/automake.texi | 37 +++++++++++++++--------------------- lib/am/check.am | 5 +---- t/ax/tap-summary-aux.sh | 1 - t/ax/testsuite-summary-checks.sh | 4 +--- t/color-tests-opt.sh | 39 ++++++++++++++++++++++++++++++++++++++ t/{color.sh => color-tests.sh} | 1 - t/{color2.sh => color-tests2.sh} | 18 ++++++++++++++++-- t/list-of-tests.mk | 5 +++-- t/tap-realtime.sh | 2 ++ 11 files changed, 84 insertions(+), 36 deletions(-) create mode 100755 t/color-tests-opt.sh rename t/{color.sh => color-tests.sh} (99%) rename t/{color2.sh => color-tests2.sh} (91%) -- 1.7.10.4 From unknown Sun Jun 22 00:48:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11855: [PATCH 1/2] check: support colorized testsuite output by default Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Sun, 22 Jul 2012 15:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11855 X-GNU-PR-Package: automake X-GNU-PR-Keywords: To: 11855@debbugs.gnu.org Cc: automake-patches@gnu.org Received: via spool by 11855-submit@debbugs.gnu.org id=B11855.134297150310844 (code B ref 11855); Sun, 22 Jul 2012 15:39:02 +0000 Received: (at 11855) by debbugs.gnu.org; 22 Jul 2012 15:38:23 +0000 Received: from localhost ([127.0.0.1]:57776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsyEf-0002oo-7V for submit@debbugs.gnu.org; Sun, 22 Jul 2012 11:38:22 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:50663) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsyES-0002oI-N2 for 11855@debbugs.gnu.org; Sun, 22 Jul 2012 11:38:11 -0400 Received: by bkty7 with SMTP id y7so4009226bkt.3 for <11855@debbugs.gnu.org>; Sun, 22 Jul 2012 08:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=hvePtsLfmqT7hWPlNe6vBWGyaUY0XLXZYj+zv9X5DnU=; b=jweQdWFldKrIjBXm1LN7ZoyNnY64deRhFutNE7fqbTFqLZCVaBgYvVfpl7Yj88Z1s0 DamnH9WBMnl62wAFRRE9Wtx2cC0L0Oh5+V7dShW7mwJE87jPC8l/vu0DdPoTr0rzhPCI 29IVHn5lIWAzniPDnZ5PWDTkUp5LqDI6kPTb1GbiH8waUPzBLgNc1uUbvveydv+V0UDm bJvQhqCz8oNAM2dCnUKQpDV3m3DmPY9dQg1FfsrX9dMWo3eOiCPdJUoO8/J1468VAXt2 6B/B9HcDNqpLXZToh59br3Vc2DNTuK2GESWC4RvNiyGCwZKNg4iCpUzJnDkQy/OHYQJO VZeA== Received: by 10.204.148.83 with SMTP id o19mr6060541bkv.74.1342971099150; Sun, 22 Jul 2012 08:31:39 -0700 (PDT) Received: from localhost.localdomain (host105-96-dynamic.4-87-r.retail.telecomitalia.it. [87.4.96.105]) by mx.google.com with ESMTPS id hs2sm5247127bkc.1.2012.07.22.08.31.37 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 08:31:38 -0700 (PDT) From: Stefano Lattarini Date: Sun, 22 Jul 2012 17:31:26 +0200 Message-Id: <2d5571e7dbfb41eec4a2657c4c076257a320d496.1342971023.git.stefano.lattarini@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: <4FF46F52.70907@gmail.com> In-Reply-To: References: X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) Fixes automake bug#11855. With this change, we make the 'color-tests' option enabled by default. That option remains still silently accepted as a no-op, for backward compatibility. The developer of a package is still free to disable testsuite coloring on a per-makefile basis (by adding "AM_COLOR_TESTS = no" to the Makefile.am) or on a whole-project basis (by AC_SUBST'ing AM_COLOR_TESTS to "no" in configure.ac). But now the user will be able to request the testsuite output to be colorized, if he really wants to: # With GNU make: make AM_COLOR_TESTS=yes check # With non-GNU make: make AM_COLOR_TESTS=yes AM_MAKEFLAGS=AM_COLOR_TESTS=yes check * NEWS: Update. * doc/automake.texi: Updated, and some related minor reformatting and rewording. * automake.in (handle_tests): No need to pass the transform '%COLOR%' when processing "check.am". * lib/am/parallel-tests.am: Remove use of the '%?COLOR%' transform; just act as if it were unconditionally TRUE. * t/color.sh: No need to specify 'color-tests' in 'AUTOMAKE_OPTIONS' nor in 'AM_INIT_AUTOMAKE'. * t/ax/testsuite-summary-checks.sh: Likewise. * t/ax/tap-summary-aux.sh: Likewise. * t/color2.sh: Likewise. Also, ensure that colorized testsuite output can be disabled by default by calling "AC_SUBST([AM_COLOR_TESTS], [no])". * t/tap-realtime.sh: Define 'AM_COLOR_TESTS' to "no" in Makefile.am, to avoid spurious colorization of the output due to the use of the 'expect' program. * t/color-tests-opt.sh: New test, check that the 'color-tests' option is still recognized as a no-op. * t/list-of-tests.mk: Add the new test. Signed-off-by: Stefano Lattarini --- NEWS | 7 +++++++ automake.in | 1 - doc/automake.texi | 37 +++++++++++++++--------------------- lib/am/check.am | 5 +---- t/ax/tap-summary-aux.sh | 1 - t/ax/testsuite-summary-checks.sh | 4 +--- t/color-tests-opt.sh | 39 ++++++++++++++++++++++++++++++++++++++ t/color.sh | 1 - t/color2.sh | 18 ++++++++++++++++-- t/list-of-tests.mk | 1 + t/tap-realtime.sh | 2 ++ 11 files changed, 82 insertions(+), 34 deletions(-) create mode 100755 t/color-tests-opt.sh diff --git a/NEWS b/NEWS index 6c39a7d..3d7b2bf 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 diff --git a/automake.in b/automake.in index 15d545d..f2a6da5 100644 --- a/automake.in +++ b/automake.in @@ -4866,7 +4866,6 @@ sub handle_tests push (@check_tests, 'check-TESTS'); my $check_deps = "@check"; $output_rules .= &file_contents ('check', new Automake::Location, - COLOR => !! option 'color-tests', SERIAL_TESTS => !! option 'serial-tests', CHECK_DEPS => $check_deps); diff --git a/doc/automake.texi b/doc/automake.texi index 9ef7e9f..251c26b 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -8843,18 +8843,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 -@samp{AM_COLOR_TESTS=no}, 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 +@samp{AM_COLOR_TESTS=no}; 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 +@samp{AM_COLOR_TESTS=always} 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 @@ -9279,9 +9279,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) -@option{color-tests}, @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. @@ -9973,13 +9973,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. -@item @option{color-tests} -@cindex Option, @option{color-tests} -@opindex 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/check.am b/lib/am/check.am index 0bbe2ee..c1e8aac 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -17,7 +17,7 @@ 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 \ @@ -40,9 +40,6 @@ am__tty_colors = { \ std=''; \ fi; \ } -else !%?COLOR% -am__tty_colors = $(am__tty_colors_dummy) -endif !%?COLOR% .PHONY: check-TESTS diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh index 25fedfe..451020c 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 9137c22..6eafdc9 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 <. + +# Check that the 'color-tests' option, now active by default, is +# nonetheless still silently accepted, for backward compatibility. + +. ./defs || exit 1 + +cat >configure.ac <Makefile.am < test-driver + +$ACLOCAL +$AUTOMAKE + +: diff --git a/t/color.sh b/t/color.sh index 61158b1..fafa403 100755 --- a/t/color.sh +++ b/t/color.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/color2.sh index e79ab27..65ca6c7 100755 --- a/t/color2.sh +++ b/t/color2.sh @@ -58,12 +58,14 @@ rm -f expect-check Makefile # Do the tests. -cat >>configure.ac <>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 @@ -182,6 +184,18 @@ for vpath in false :; do 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="env AM_COLOR_TESTS=always $MAKE" \ + expect -f $srcdir/expect-make >stdout || { cat stdout; exit 1; } + cat stdout + test_color + $MAKE distclean cd $srcdir diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 2a28992..91f32cc 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -229,6 +229,7 @@ t/colon6.sh \ t/colon7.sh \ t/color.sh \ t/color2.sh \ +t/color-tests-opt.sh \ t/comment.sh \ t/comment2.sh \ t/comment3.sh \ diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh index ecd3bef..97b035c 100755 --- a/t/tap-realtime.sh +++ b/t/tap-realtime.sh @@ -53,7 +53,9 @@ fi 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' -- 1.7.10.4 From unknown Sun Jun 22 00:48:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11855: [PATCH 2/2] tests: better name for a couple of tests Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Sun, 22 Jul 2012 15:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11855 X-GNU-PR-Package: automake X-GNU-PR-Keywords: To: 11855@debbugs.gnu.org Cc: automake-patches@gnu.org Received: via spool by 11855-submit@debbugs.gnu.org id=B11855.134297150310849 (code B ref 11855); Sun, 22 Jul 2012 15:39:02 +0000 Received: (at 11855) by debbugs.gnu.org; 22 Jul 2012 15:38:23 +0000 Received: from localhost ([127.0.0.1]:57778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsyEg-0002os-VD for submit@debbugs.gnu.org; Sun, 22 Jul 2012 11:38:23 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:43137) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsyET-0002oG-PV for 11855@debbugs.gnu.org; Sun, 22 Jul 2012 11:38:12 -0400 Received: by mail-bk0-f44.google.com with SMTP id y7so4009216bkt.3 for <11855@debbugs.gnu.org>; Sun, 22 Jul 2012 08:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=DqMR08zKWyKECu3vo4I6cHemNT+ixH477uzLS10gzCM=; b=HtBvV4gBgo2E3y31IXAdC6FqEB80fnOFNbgifSFvt8rBY/uFWQYaZqDqDUhHqfxqnT ibbIVqTAZUF10rimA23zVfJs+bQ/mGSNIMp/tNdccBVfoWSv72dk62NzxVaLwMP/v5GD zdho6aWfBhvLgeYp7GWpAgNpmTM05yxgyc8K41L1tTxd7JiLP1OMNdMB2pu8ZD6oQITC Vq45I3iqLAnbSqL23j0fwmvBGLjMcQvwmS9deUmY/KZ/WiCVAx0lhWw2HZFyjpV93Ulx C9l4rE2dd+1z9/+EcC28lRvgv7UQLTNSKFTvGElr9XPAJCprwEHETE56ETvys08r6NMe UVFg== Received: by 10.204.152.220 with SMTP id h28mr6082509bkw.30.1342971100580; Sun, 22 Jul 2012 08:31:40 -0700 (PDT) Received: from localhost.localdomain (host105-96-dynamic.4-87-r.retail.telecomitalia.it. [87.4.96.105]) by mx.google.com with ESMTPS id hs2sm5247127bkc.1.2012.07.22.08.31.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 08:31:39 -0700 (PDT) From: Stefano Lattarini Date: Sun, 22 Jul 2012 17:31:27 +0200 Message-Id: <3ffce6240040e51a60fc5a40cbb8d669baa5f7b5.1342971023.git.stefano.lattarini@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: <4FF46F52.70907@gmail.com> In-Reply-To: References: X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) * t/color.sh: Rename ... * t/color-tests.sh: ... like this. * t/color2.sh: Rename ... * t/color-tests2.sh: ... like this. * t/list-of-tests.mk: Adjust. Signed-off-by: Stefano Lattarini --- t/{color.sh => color-tests.sh} | 0 t/{color2.sh => color-tests2.sh} | 0 t/list-of-tests.mk | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename t/{color.sh => color-tests.sh} (100%) rename t/{color2.sh => color-tests2.sh} (100%) diff --git a/t/color.sh b/t/color-tests.sh similarity index 100% rename from t/color.sh rename to t/color-tests.sh diff --git a/t/color2.sh b/t/color-tests2.sh similarity index 100% rename from t/color2.sh rename to t/color-tests2.sh diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 91f32cc..9ab8f28 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -227,8 +227,8 @@ t/colon4.sh \ t/colon5.sh \ t/colon6.sh \ t/colon7.sh \ -t/color.sh \ -t/color2.sh \ +t/color-tests.sh \ +t/color-tests2.sh \ t/color-tests-opt.sh \ t/comment.sh \ t/comment2.sh \ -- 1.7.10.4 From unknown Sun Jun 22 00:48:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11855: [PATCH 0/2] Enable colorized testsuite output by default Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Tue, 24 Jul 2012 17:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11855 X-GNU-PR-Package: automake X-GNU-PR-Keywords: To: 11855@debbugs.gnu.org Cc: control@debbugs.gnu.org, automake-patches@gnu.org Received: via spool by 11855-submit@debbugs.gnu.org id=B11855.13431524971830 (code B ref 11855); Tue, 24 Jul 2012 17:55:02 +0000 Received: (at 11855) by debbugs.gnu.org; 24 Jul 2012 17:54:57 +0000 Received: from localhost ([127.0.0.1]:36658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1StjJw-0000TR-Py for submit@debbugs.gnu.org; Tue, 24 Jul 2012 13:54:57 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:44782) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1StjJt-0000TF-U4; Tue, 24 Jul 2012 13:54:55 -0400 Received: by bkty7 with SMTP id y7so5917463bkt.3 for ; Tue, 24 Jul 2012 10:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=FZ9z0PobJRszfjilwwVqALvI013rIV/Mk2KRFKAdQ1s=; b=zpcwpO3SaNHZfugUTZGfh1Kbody4jgiPm+7F+PO+XErqEMG0uWWiMz12DG3sVIA4yN 4V7l+Bygpwpo57Q3IvTQ8sO0o71KUVt7leMtfh72bCa5kfq0gdwKdh6yGuoK0mnL/as1 61Cih4aYWx/u/w2pKiNTgkPCA9YY0kEJ1VJFchHa14EHRz3/Pl3E9caAQc0//d991cDj zWqvbAyslO5so2X1lym2uN0lWr5R4CG3Ucnmf2NFEkJLy5ceQvOr4jfIDKeZ0OSHSLcf cW5AymoF0y+pO5mMLUkgVAOCZJSr/wGGVz9r8SJFXm1mXIIlKgusnexjGVnQxUNExF71 Cdsg== Received: by 10.204.10.92 with SMTP id o28mr10973054bko.39.1343152092142; Tue, 24 Jul 2012 10:48:12 -0700 (PDT) Received: from [192.168.178.21] (host105-96-dynamic.4-87-r.retail.telecomitalia.it. [87.4.96.105]) by mx.google.com with ESMTPS id hg13sm11440415bkc.7.2012.07.24.10.48.09 (version=SSLv3 cipher=OTHER); Tue, 24 Jul 2012 10:48:11 -0700 (PDT) Message-ID: <500EDFD5.7050809@gmail.com> Date: Tue, 24 Jul 2012 19:48:05 +0200 From: Stefano Lattarini MIME-Version: 1.0 References: <4FF46F52.70907@gmail.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) tags 11855 + patch close 11855 thanks On 07/22/2012 05:31 PM, Stefano Lattarini wrote: > Reference: > > The actual implementation is done by the first patch. The second on > is just a minor testsuite cleanup "while we are at it". > > I intend to push this series by tomorrow. > > Regards, > Stefano > > Stefano Lattarini (2): > check: support colorized testsuite output by default > tests: better name for a couple of tests > > NEWS | 7 +++++++ > automake.in | 1 - > doc/automake.texi | 37 +++++++++++++++--------------------- > lib/am/check.am | 5 +---- > t/ax/tap-summary-aux.sh | 1 - > t/ax/testsuite-summary-checks.sh | 4 +--- > t/color-tests-opt.sh | 39 ++++++++++++++++++++++++++++++++++++++ > t/{color.sh => color-tests.sh} | 1 - > t/{color2.sh => color-tests2.sh} | 18 ++++++++++++++++-- > t/list-of-tests.mk | 5 +++-- > t/tap-realtime.sh | 2 ++ > 11 files changed, 84 insertions(+), 36 deletions(-) > create mode 100755 t/color-tests-opt.sh > rename t/{color.sh => color-tests.sh} (99%) > rename t/{color2.sh => color-tests2.sh} (91%) > Pushed. I'm thus closing this bug report. Regards, Stefano