From dc326edfc83ed1294d04abb9a5302b21d8f5cc05 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 27 Jul 2012 19:19:51 +0200 Subject: [PATCH] [ng] refactor: read 'color-tests.am' more verbatim * lib/am/color-tests.am (am.test-suite.tty-colors): Define with the 'define' built-in rather than with '='. * automake.in (handle_tests): Use '&almost_verbatim' rather than '&file_contents' to read and process 'color-tests.am'. Signed-off-by: Stefano Lattarini --- automake.in | 2 +- lib/am/color-tests.am | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/automake.in b/automake.in index 4799dd690..01df5fee1 100644 --- a/automake.in +++ b/automake.in @@ -4102,7 +4102,7 @@ sub handle_tests if (var ('TESTS')) { push (@check_tests, 'check-TESTS'); - $output_rules .= file_contents ('color-tests', new Automake::Location); + almost_verbatim ('color-tests'); if (option 'serial-tests') { almost_verbatim ('serial-tests'); diff --git a/lib/am/color-tests.am b/lib/am/color-tests.am index a7cf297ed..eb670e591 100644 --- a/lib/am/color-tests.am +++ b/lib/am/color-tests.am @@ -14,7 +14,8 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -am.test-suite.tty-colors = { \ +define am.test-suite.tty-colors +{ \ if test "X$(AM_COLOR_TESTS)" = Xno; then \ am__color_tests=no; \ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ @@ -39,3 +40,4 @@ am.test-suite.tty-colors = { \ mgn= red= grn= lgn= blu= brg= std=; \ fi; \ } +endef -- 2.47.2